From: Guillaume Pellerin Date: Wed, 4 Dec 2013 16:27:14 +0000 (+0100) Subject: Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telemeta into dev X-Git-Tag: 1.4.5~3^2~12 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3bfbeefa4e582f4a9a775260d17f5729b77845ad;p=telemeta.git Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telemeta into dev --- 3bfbeefa4e582f4a9a775260d17f5729b77845ad