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

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

d07e73680ac17844a484ee3e28e690428ab6cf99