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

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

65452d3eda138e952e631572c640ea68e4b52ad2