From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 14 Feb 2014 13:48:45 +0000 (+0100)
Subject: Merge pull request #32 from DavidDoukhan/dev
X-Git-Tag: 0.5.4~3^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=bdf0f27bdc72d7f6e1c90dc4db5cca15b93970e2;p=timeside.git

Merge pull request #32 from DavidDoukhan/dev

Dev
---

bdf0f27bdc72d7f6e1c90dc4db5cca15b93970e2