From: yomguy <yomguy@parisson.com>
Date: Mon, 5 Mar 2012 12:17:31 +0000 (+0100)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.4.3-2~7^2~26
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=86f7310adc39a6428b7bdc699f2d3d9e4e0eb073;p=telemeta.git

Merge branch 'master' into dev
---

86f7310adc39a6428b7bdc699f2d3d9e4e0eb073