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

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

d70b6928bb9212d9ba2f362dcfe2ae9f1b07c746