From: yomguy <yomguy@parisson.com>
Date: Thu, 27 Oct 2011 10:10:18 +0000 (+0200)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.5.0rc3~97^2~89
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c4ed73d669151fe4ecfbe7a2d1f28f6de189fd35;p=telemeta.git

Merge branch 'master' into crem
---

c4ed73d669151fe4ecfbe7a2d1f28f6de189fd35