From: yomguy <yomguy@parisson.com>
Date: Thu, 4 Oct 2012 11:53:51 +0000 (+0200)
Subject: Merge branch 'dev' into lam
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a73b4d2509033a33a71ca6a586423a3d56427a04;p=telemeta.git

Merge branch 'dev' into lam
---

a73b4d2509033a33a71ca6a586423a3d56427a04