From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 20 Jul 2012 17:44:42 +0000 (+0200)
Subject: Merge branch 'master' of /var/git/teleforma
X-Git-Tag: 0.7.1~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f4ea342ff058a82e95626cc9280dc37c4730a5df;p=teleforma.git

Merge branch 'master' of /var/git/teleforma
---

f4ea342ff058a82e95626cc9280dc37c4730a5df