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

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

d31d8322b4ca994d501744dffaa9f2a47d3dd354