From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 24 Oct 2014 17:20:57 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 0.6~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8374fadaa46ea0dfd45587ee9c5a57adf4a16505;p=timeside.git

Merge branch 'dev'
---

8374fadaa46ea0dfd45587ee9c5a57adf4a16505