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

Merge branch 'dev' into lam
---

bef4e62b1eced068291d794e12637cd527cbe012