From: yomguy <yomguy@parisson.com>
Date: Mon, 8 Oct 2012 13:38:13 +0000 (+0200)
Subject: Merge branch 'dev' into lam
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3173cd7e043ae432398da59b6bcc766fe3d577af;p=telemeta.git

Merge branch 'dev' into lam
---

3173cd7e043ae432398da59b6bcc766fe3d577af