From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 9 Apr 2014 00:04:26 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 0.5.5~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fb29045a228570ee540dae1343f5f3383e81c5ea;p=timeside.git

Merge branch 'dev'
---

fb29045a228570ee540dae1343f5f3383e81c5ea