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

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

f632d3206a5b625ee830dbc74348f96e2cab3455