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

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

7ea18a7b782e9ef9224eba0379cf9ce11025aa15