From: yomguy <yomguy@parisson.com>
Date: Tue, 2 Oct 2012 21:10:39 +0000 (+0200)
Subject: Merge branch 'master' into lam
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9df3f573717af7e1c2242db813a3c7cc957f7217;p=telemeta.git

Merge branch 'master' into lam
---

9df3f573717af7e1c2242db813a3c7cc957f7217