From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 23 Oct 2014 08:32:53 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 0.6~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ed4322e7aef6a4dba8697814714e60c607d8ec58;p=timeside.git

Merge branch 'dev'
---

ed4322e7aef6a4dba8697814714e60c607d8ec58