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

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

d7d87218ff55e342fd9eebcc4c8aaece29a3b408