From: yomguy <yomguy@parisson.com>
Date: Fri, 6 Apr 2012 08:14:33 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.4.3-2~7^2~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=42d439dbdf94db7e7481e7d9f5177959d3ab3478;p=telemeta.git

Merge branch 'master' into dev
---

42d439dbdf94db7e7481e7d9f5177959d3ab3478