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

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

bbe585ad1b46052e2f2984618ddf1793578667d2