From: yomguy <yomguy@parisson.com>
Date: Tue, 2 Oct 2012 21:10:29 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.4.5~58^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b1174f9f04e9d33e614390d90797351083670683;p=telemeta.git

Merge branch 'master' into dev
---

b1174f9f04e9d33e614390d90797351083670683