From: yomguy <yomguy@parisson.com>
Date: Thu, 4 Oct 2012 14:45:36 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.4.5~51^2^2~6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0273b842fbad7e3d7a01f74fc12b965fa8bcdc30;p=telemeta.git

Merge branch 'dev'
---

0273b842fbad7e3d7a01f74fc12b965fa8bcdc30