From: yomguy <yomguy@parisson.com>
Date: Thu, 10 Nov 2011 15:10:28 +0000 (+0100)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.3.9~3^2~1^2~39
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=65bda9e926df703b9893048a40b30f794d5d5a52;p=telemeta.git

Merge branch 'master' into crem
---

65bda9e926df703b9893048a40b30f794d5d5a52