From: yomguy <yomguy@parisson.com>
Date: Tue, 25 Sep 2012 10:12:46 +0000 (+0200)
Subject: Merge branch 'dev' into lam
X-Git-Tag: 1.4.4-lam~10
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=93317028583ca2529e166e2c4e378d0b7fb64f89;p=telemeta.git

Merge branch 'dev' into lam
---

93317028583ca2529e166e2c4e378d0b7fb64f89