From: yomguy <yomguy@parisson.com>
Date: Thu, 4 Oct 2012 10:51:34 +0000 (+0200)
Subject: Merge branch 'dev' into crem
X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~14
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ecd6f3e4c44c93fd17b8c7efe75eb6c35990d1c8;p=telemeta.git

Merge branch 'dev' into crem
---

ecd6f3e4c44c93fd17b8c7efe75eb6c35990d1c8