From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 8 Apr 2013 10:28:42 +0000 (+0200)
Subject: Merge branch 'dev' of /var/git/telemeta into dev
X-Git-Tag: 1.4.5~40
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=edc3b0a9d5a60cd29bf1ce4be93d4fe37c14d13d;p=telemeta.git

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

edc3b0a9d5a60cd29bf1ce4be93d4fe37c14d13d