From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 20 May 2014 10:01:37 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 0.5.6~4^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=61cd3d31b7d2e9859f641edebf437a93cc526df6;p=timeside.git

Merge branch 'dev'
---

61cd3d31b7d2e9859f641edebf437a93cc526df6