From: yomguy <yomguy@parisson.com>
Date: Tue, 14 Feb 2012 15:05:46 +0000 (+0100)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~35^2~22
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3afcd544d7dd6f6c5436dd58c4f43849175962eb;p=telemeta.git

Merge branch 'master' into crem

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

3afcd544d7dd6f6c5436dd58c4f43849175962eb