From: yomguy <yomguy@parisson.com>
Date: Mon, 19 Nov 2012 16:02:18 +0000 (+0100)
Subject: Merge branch 'dev' into generic
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ce3400911bd1d7a36f642a98779fb36c9b5472e3;p=telemeta.git

Merge branch 'dev' into generic
---

ce3400911bd1d7a36f642a98779fb36c9b5472e3