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

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

064b1969b07ec1bc7f45297e70c0a3d114e4647c