From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 20 Jul 2012 08:55:25 +0000 (+0200)
Subject: Merge branch 'dev' of /var/git/telemeta into dev
X-Git-Tag: 1.4.5~67
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4eee358da7a9dc4541a8a5078d815c6e9f380859;p=telemeta.git

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

4eee358da7a9dc4541a8a5078d815c6e9f380859