From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 7 Feb 2013 15:49:15 +0000 (+0100)
Subject: Merge branch 'pro' of /var/git/teleforma into pro
X-Git-Tag: 0.9-probarreau~64^2~16
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=806e2f4a8a1e6f69a49d77c2622ce0baed44bddd;p=teleforma.git

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

806e2f4a8a1e6f69a49d77c2622ce0baed44bddd