From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 24 Sep 2012 11:54:11 +0000 (+0200)
Subject: Merge branch 'dev' of /var/git/telemeta into dev
X-Git-Tag: 1.4.5~61
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f383214cb73f4bbb177fb6c085ddf28adb3e0f48;p=telemeta.git

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

f383214cb73f4bbb177fb6c085ddf28adb3e0f48