From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 18 Jul 2014 14:30:05 +0000 (+0200)
Subject: Merge branch 'crfpa' of git+ssh://vcs.parisson.com/var/git/teleforma into crfpa
X-Git-Tag: 1.1~399
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5d426cf39105a16e3940444730364a20fbe44878;p=teleforma.git

Merge branch 'crfpa' of git+ssh://vcs.parisson.com/var/git/teleforma into crfpa
---

5d426cf39105a16e3940444730364a20fbe44878