]> git.parisson.com Git - telemeta.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)
commit721eb43967fedc832519ff4ff9426d69fbd5609c
tree0ecafd27ab55f634e042396f6d052e61b299ba7e
parentf5ee84d112bb2e7467d42b7d86328f10bba91b1f
parentadf00f3b626fcd47b4f355f5ff5244681d0d7f7c
Merge branch 'master' into crem
fix help pages

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