From: yomguy <yomguy@parisson.com>
Date: Mon, 8 Oct 2012 13:38:06 +0000 (+0200)
Subject: Merge branch 'dev' into crem
X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~11
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2a32528ac245663c3ef770a4f73f460924bc9038;p=telemeta.git

Merge branch 'dev' into crem
---

2a32528ac245663c3ef770a4f73f460924bc9038