From: yomguy <yomguy@parisson.com>
Date: Tue, 18 Dec 2012 09:14:50 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Tag: 1.4.5~51^2^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b58f35ec9d80b97b9341ec51e6c7a71a44a68fe8;p=telemeta.git

Merge branch 'dev'
---

b58f35ec9d80b97b9341ec51e6c7a71a44a68fe8