From: yomguy <yomguy@parisson.com>
Date: Tue, 14 Feb 2012 15:05:46 +0000 (+0100)
Subject: Merge branch 'master' into crem
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6cf1395f2ec1784d2f80583ef6a9faa343b5b515;p=telemeta-pages.git

Merge branch 'master' into crem

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

6cf1395f2ec1784d2f80583ef6a9faa343b5b515