From: Gaël Lemignot Date: Wed, 28 Nov 2012 12:49:45 +0000 (+0100) Subject: Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro X-Git-Tag: 0.9-probarreau~260^2~1 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=acd561276b0a3cf154e2dcb4d184b8127f12b14a;p=teleforma.git Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro --- acd561276b0a3cf154e2dcb4d184b8127f12b14a