From: yomguy <yomguy@parisson.com>
Date: Mon, 17 Sep 2012 16:22:25 +0000 (+0200)
Subject: Merge branch 'dev' into lam
X-Git-Tag: 1.4.4-lam~15
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0fbad9a0fe7e95d8c046771ac1c00a571d4ea205;p=telemeta.git

Merge branch 'dev' into lam
---

0fbad9a0fe7e95d8c046771ac1c00a571d4ea205