From: Guillaume Pellerin Date: Fri, 31 May 2013 15:35:01 +0000 (+0200) Subject: Merge branch 'pro' of /var/git/teleforma into pro X-Git-Tag: 2.8.1-pro~484^2~12 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=aeb76f44a69cb4bc8ed4059d76df3a6a76e7c5fb;p=teleforma.git Merge branch 'pro' of /var/git/teleforma into pro --- aeb76f44a69cb4bc8ed4059d76df3a6a76e7c5fb