From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 26 Sep 2012 11:35:36 +0000 (+0200)
Subject: Merge branch 'dev' of /var/git/telemeta into dev
X-Git-Tag: 1.4.5~60
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=53ec1d7ed24460b9b7878d25996888ed7c22d4d7;p=telemeta.git

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

53ec1d7ed24460b9b7878d25996888ed7c22d4d7