From: yomguy <yomguy@parisson.com>
Date: Tue, 2 Oct 2012 09:17:54 +0000 (+0200)
Subject: Merge branch 'dev' into lam
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5c8410f30ca61242c59d491c1c8f454830dd7884;p=telemeta.git

Merge branch 'dev' into lam
---

5c8410f30ca61242c59d491c1c8f454830dd7884