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

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

f9d2d0d996f3346c597917a43aa5710a24e68c82