From: yomguy <yomguy@parisson.com>
Date: Fri, 28 Oct 2011 12:07:59 +0000 (+0200)
Subject: Merge branch 'master' into crem
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fb4103b8a4a670145c4b4b8d56d2c55ddda8d2ec;p=telemeta-pages.git

Merge branch 'master' into crem

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

fb4103b8a4a670145c4b4b8d56d2c55ddda8d2ec