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

Merge branch 'develop' into lam
---

efa5176265a6d11d55079b7212f8a48d7f224d1c