From: yomguy <yomguy@parisson.com>
Date: Wed, 30 May 2012 09:37:44 +0000 (+0200)
Subject: Merge branch 'develop' into lam
X-Git-Tag: 1.4.3-2^2~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c805c900577d44db6045fef26f2a2ddef58724e5;p=telemeta.git

Merge branch 'develop' into lam
---

c805c900577d44db6045fef26f2a2ddef58724e5