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

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

3a25883224b55172b3410f6a94b24383bc2ae9cc