From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 17 Sep 2012 16:50:21 +0000 (+0200)
Subject: Merge branch 'dev' of /var/git/telemeta into dev
X-Git-Tag: 1.4.5~66
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3005e66e403cf3d9d0ef568b8d9167a10d5ecc96;p=telemeta.git

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

3005e66e403cf3d9d0ef568b8d9167a10d5ecc96