From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 4 Oct 2012 14:47:12 +0000 (+0200)
Subject: Merge branch 'dev' of /var/git/telemeta into dev
X-Git-Tag: 1.4.5~54
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c7801a144fbb63660e9de0a4307b8d93d8114f2a;p=telemeta.git

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

c7801a144fbb63660e9de0a4307b8d93d8114f2a