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

Merge branch 'dev'
---

242fcb0a7a038a236a39884fc1b18e61f0d80f52