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

Merge branch 'dev'
---

44addfce9135a0270da7548fb09afd5e65d522f4