From: yomguy <yomguy@parisson.com>
Date: Fri, 28 Oct 2011 12:07:59 +0000 (+0200)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.3.9~3^2~1^2~52
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=14a64414c0f4cd6c0be5371747b454cd461fd940;p=telemeta.git

Merge branch 'master' into crem

Conflicts:
	telemeta/pages/fr/home.rst
---

14a64414c0f4cd6c0be5371747b454cd461fd940