From: yomguy <yomguy@parisson.com>
Date: Mon, 8 Oct 2012 13:38:20 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.4.5~51^2^2~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=39a65c926ab387276454343b91bf5d92ce9e8b45;p=telemeta.git

Merge branch 'dev'
---

39a65c926ab387276454343b91bf5d92ce9e8b45