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

Merge branch 'dev' into crem
---

f82c12d42a840d037620b59e577c34fff898ee91