From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 17 Dec 2013 17:09:30 +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~8
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c4e68e0a554eb3a68efd03823d6d9508bd54fd03;p=telemeta.git

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

c4e68e0a554eb3a68efd03823d6d9508bd54fd03