From: Guillaume Pellerin Date: Thu, 12 Sep 2013 11:24:18 +0000 (+0200) Subject: Merge branch 'crfpa' of /var/git/teleforma into crfpa X-Git-Tag: 1.1~526 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3f54890d20145ae760554a98243522af20d8c122;p=teleforma.git Merge branch 'crfpa' of /var/git/teleforma into crfpa --- 3f54890d20145ae760554a98243522af20d8c122