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

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

39cae2c24b4dcd652451e67b5e85e7ab6dbb2c61