From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 7 Feb 2013 14:24:32 +0000 (+0100)
Subject: Merge branch 'dev' of /var/git/telemeta into dev
X-Git-Tag: 1.4.5~46
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c742602873b813c311d1cd8d76a1143f10b7571a;p=telemeta.git

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

c742602873b813c311d1cd8d76a1143f10b7571a