From: Javier Sancho <jsf@jsancho.org>
Date: Mon, 24 Apr 2017 18:14:11 +0000 (+0200)
Subject: Merge branch 'feature/composition' into develop
X-Git-Url: https://git.jsancho.org/?p=gacela.git;a=commitdiff_plain;h=00a6aa06bc7d618a3a4c158096efaee9c43d4cd6;hp=a6e989f0208d704ad6d0e7751ebb6d9ff776e797

Merge branch 'feature/composition' into develop
---