From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 14 Jan 2013 16:49:09 +0000 (+0100)
Subject: Merge branch 'dev' of /var/git/telemeta into dev
X-Git-Tag: 1.4.5~50
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=356054c14063d5487e8f2e9842935adc3fd26654;p=telemeta.git

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

356054c14063d5487e8f2e9842935adc3fd26654