From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 20 May 2014 09:32:33 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 0.5.5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0d7b800b5ca81609dbfeca9ed0f2bfdef692e8c3;p=timeside.git

Merge branch 'dev'
---

0d7b800b5ca81609dbfeca9ed0f2bfdef692e8c3