From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 8 Feb 2013 13:51:29 +0000 (+0100)
Subject: Merge branch 'pro' of /var/git/teleforma into pro
X-Git-Tag: 0.9-probarreau~64^2~10
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6bb00625222a5274ad4c858294bed3c31d969c10;p=teleforma.git

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

6bb00625222a5274ad4c858294bed3c31d969c10