From: yomguy <yomguy@parisson.com>
Date: Thu, 4 Oct 2012 14:34:48 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.4.5~51^2^2~7
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b3ef9fac129de42f4c4e3800a0768f0e32e2738f;p=telemeta.git

Merge branch 'dev'
---

b3ef9fac129de42f4c4e3800a0768f0e32e2738f