From: Guillaume Pellerin <yomguy@parisson.com>
Date: Sun, 29 Dec 2013 22:27:00 +0000 (+0100)
Subject: Merge branch 'master' of /var/git/telemeta into dev
X-Git-Tag: 1.4.5-1~19^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e4e8923649205beac57257947a1064e790c66ca3;p=telemeta.git

Merge branch 'master' of /var/git/telemeta into dev
---

e4e8923649205beac57257947a1064e790c66ca3