From: yomguy <yomguy@parisson.com>
Date: Mon, 17 Sep 2012 16:11:05 +0000 (+0200)
Subject: Merge branch 'dev' into lam
X-Git-Tag: 1.4.4-lam~16
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3c575f0d63ee4377ac790fb4ffdc84c7dc453f33;p=telemeta.git

Merge branch 'dev' into lam
---

3c575f0d63ee4377ac790fb4ffdc84c7dc453f33