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

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

e358d1c0f8bb330e66d76643a400eafb23d03e20