From: Guillaume Pellerin Date: Fri, 8 Feb 2013 13:52:40 +0000 (+0100) Subject: Merge branch 'pro' of /var/git/teleforma into pro X-Git-Tag: 0.9-probarreau~64^2~9 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c67a3b2e024c8b71b6fd5ea8f37c1893c6f11c6f;p=teleforma.git Merge branch 'pro' of /var/git/teleforma into pro --- c67a3b2e024c8b71b6fd5ea8f37c1893c6f11c6f