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

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

cf9fa7467a062097c89ab9e67632be906521fd5f