From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 7 Feb 2013 16:02:27 +0000 (+0100)
Subject: Merge branch 'pro' of /var/git/teleforma into pro
X-Git-Tag: 0.9-probarreau~64^2~13
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=12d6ac6635a49d1b9c6a09065983c31630ec4df5;p=teleforma.git

Merge branch 'pro' of /var/git/teleforma into pro
---

12d6ac6635a49d1b9c6a09065983c31630ec4df5