]> git.parisson.com Git - telemeta-pages.git/commit
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Thu, 17 Nov 2011 08:57:03 +0000 (09:57 +0100)
committeryomguy <yomguy@parisson.com>
Thu, 17 Nov 2011 08:57:03 +0000 (09:57 +0100)
commitc110113a320c939c2ff46e1717b33470e52d3d2d
tree3213e4d52a1d7c771bac14c0f915a0cc09943e31
parentc0da5f90b5ba1e87b0be42bfe2d415fda5bcb0ef
parent597b0b73847dc9f0e2a7ef6be77fd28e4e980f09
Merge branch 'master' into crem

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