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

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

4e501505fa225593d998a58d155d0d55cde61d4d