From: yomguy <yomguy@parisson.com>
Date: Mon, 9 Jul 2012 11:42:59 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.4.4~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7c730240d6160a05aff5117382a0e3a9a29af451;p=telemeta.git

Merge branch 'dev'
---

7c730240d6160a05aff5117382a0e3a9a29af451