From: Guillaume Pellerin <yomguy@parisson.com>
Date: Sun, 15 Dec 2013 23:11:36 +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^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5a768ea3529a61eea4ae6f3063b403471dea38ba;p=telemeta.git

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

5a768ea3529a61eea4ae6f3063b403471dea38ba