From: yomguy <yomguy@parisson.com>
Date: Thu, 31 May 2012 20:32:18 +0000 (+0200)
Subject: Merge branch 'master' into lam
X-Git-Tag: 1.4.4-lam~24
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=55f79a8c4baf06972e7142da0f0b8f6ffad99cf7;p=telemeta.git

Merge branch 'master' into lam
---

55f79a8c4baf06972e7142da0f0b8f6ffad99cf7