From: yomguy <yomguy@parisson.com>
Date: Thu, 17 Nov 2011 08:57:03 +0000 (+0100)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.3.9~3^2~1^2~36
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=69cf1fbe03a2476d14c63788e59446e809f4589c;p=telemeta.git

Merge branch 'master' into crem

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

69cf1fbe03a2476d14c63788e59446e809f4589c