From: yomguy <yomguy@parisson.com>
Date: Thu, 17 Nov 2011 08:57:03 +0000 (+0100)
Subject: Merge branch 'master' into crem
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c110113a320c939c2ff46e1717b33470e52d3d2d;p=telemeta-pages.git

Merge branch 'master' into crem

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

c110113a320c939c2ff46e1717b33470e52d3d2d