From: yomguy <yomguy@parisson.com>
Date: Tue, 8 Jan 2013 08:48:24 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Tag: 1.4.5~51^2^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=32e0615d02b7226f1be6296949222b1727e4959b;p=telemeta.git

Merge branch 'dev'
---

32e0615d02b7226f1be6296949222b1727e4959b