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

Merge branch 'dev'
---

8a17e2d0f4e7dc38e8f049b8f4717e916f8cc06b