]> git.parisson.com Git - telemeta-pages.git/commit
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Tue, 14 Feb 2012 15:02:30 +0000 (16:02 +0100)
committeryomguy <yomguy@parisson.com>
Tue, 14 Feb 2012 15:02:30 +0000 (16:02 +0100)
commit9aadef05875daf2ed0c39f6ce4f616f9b47a646d
tree21efb5aaa06bd4d1375121927c527f06ca9d4597
parent2fcb0185959590d31252c512cbdb4178f1217062
parenta5e9e77d13bb3bde8ed6fe199db281a97051fd9d
Merge branch 'master' into crem
fix help pages

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