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

Merge branch 'dev'
---

f6666ad5c933d168bb1d7d90de6c016b475f9d8a