From: yomguy <yomguy@parisson.com>
Date: Wed, 7 Nov 2012 11:32:12 +0000 (+0100)
Subject: Merge branch 'ae' of git+ssh://vcs.parisson.com/var/git/teleforma into dev
X-Git-Tag: 0.9-probarreau~320
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c44c39317c45c93c66c05276ce45026e9529f6fd;p=teleforma.git

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

c44c39317c45c93c66c05276ce45026e9529f6fd