From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 20 Sep 2012 14:28:19 +0000 (+0200)
Subject: Merge branch 'dev' of /var/git/telemeta into dev
X-Git-Tag: 1.4.5~65
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=bd218788c6b20fd3f7eb7f1f1b05877cf3769ec0;p=telemeta.git

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

bd218788c6b20fd3f7eb7f1f1b05877cf3769ec0