From: yomguy <yomguy@parisson.com>
Date: Fri, 1 Mar 2013 10:42:33 +0000 (+0100)
Subject: Merge branch 'dev' into crem
X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=bcd35f3dfb36a8e225a2a789f83e231e9cc0b06f;p=telemeta.git

Merge branch 'dev' into crem
---

bcd35f3dfb36a8e225a2a789f83e231e9cc0b06f