From: yomguy <yomguy@parisson.com>
Date: Thu, 4 Apr 2013 14:11:35 +0000 (+0200)
Subject: Merge branch 'dev' into crem
X-Git-Tag: 1.5.0rc3~46^2~7
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6c15164b892cc7e093947f396f4d2733ae105d48;p=telemeta.git

Merge branch 'dev' into crem
---

6c15164b892cc7e093947f396f4d2733ae105d48