From: Thomas Fillon <thomas@parisson.com>
Date: Tue, 3 Mar 2015 21:54:43 +0000 (+0100)
Subject: Merge branch 'feature/docker-compose' of github.com:parisson/TimeSide into feature... 
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c94fca52572acdb1c62f3f65c668fe63a0de9faf;p=timeside.git

Merge branch 'feature/docker-compose' of github.com:parisson/TimeSide into feature/docker-compose
---

c94fca52572acdb1c62f3f65c668fe63a0de9faf