From: yomguy <yomguy@parisson.com>
Date: Thu, 4 Apr 2013 13:31:39 +0000 (+0200)
Subject: Merge branch 'dev' into crem2
X-Git-Tag: 1.4.5~2^2~4^2~2^2~24
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=64116337b1922e307ba58f89c60a59d0c5f1f2ed;p=telemeta.git

Merge branch 'dev' into crem2
---

64116337b1922e307ba58f89c60a59d0c5f1f2ed