From: yomguy <yomguy@parisson.com>
Date: Mon, 7 Jan 2013 10:07:41 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Tag: 1.4.5~51^2^2~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0a47ff092102e60e3666fa90bcdb5c96997cd59b;p=telemeta.git

Merge branch 'dev'
---

0a47ff092102e60e3666fa90bcdb5c96997cd59b