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

Merge branch 'dev' into lam
---

30c818508389d8311913a1dedab2dd18cd00c726