From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 30 Dec 2013 22:11:09 +0000 (+0100)
Subject: Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telemeta into dev
X-Git-Tag: 1.4.5-1~19
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ef4bdc028c48ecd77853761d7d1f81edb8e2ceae;p=telemeta.git

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

ef4bdc028c48ecd77853761d7d1f81edb8e2ceae