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

Merge branch 'dev' into lam
---

1f65651432d6370a74aefe39c331e53f0273e983