From: yomguy <yomguy@parisson.com>
Date: Tue, 8 Jan 2013 08:35:11 +0000 (+0100)
Subject: Merge branch 'dev' into lam
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fafadfa55d0e3bf8e290b3e9cf612a3f1184aca8;p=telemeta.git

Merge branch 'dev' into lam
---

fafadfa55d0e3bf8e290b3e9cf612a3f1184aca8