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

Merge branch 'dev' into lam
---

eae9ad866be3d32560ecd42d45c0b58c6de50e6d