From: yomguy <yomguy@parisson.com>
Date: Mon, 17 Sep 2012 12:47:30 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.4.4-lam~19^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1db883ef6829c83cf0b96d55efc76a3646bb2598;p=telemeta.git

Merge branch 'dev'
---

1db883ef6829c83cf0b96d55efc76a3646bb2598