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

Merge branch 'master' into lam
---

4ed20b703db55a18b46090526d2b6d62186f81aa