]> git.parisson.com Git - telemeta-pages.git/commit
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Tue, 14 Feb 2012 15:05:46 +0000 (16:05 +0100)
committeryomguy <yomguy@parisson.com>
Tue, 14 Feb 2012 15:05:46 +0000 (16:05 +0100)
commit6cf1395f2ec1784d2f80583ef6a9faa343b5b515
tree21efb5aaa06bd4d1375121927c527f06ca9d4597
parent9aadef05875daf2ed0c39f6ce4f616f9b47a646d
parent66b43bda6d779c0a6b01ae55f4452822e8d557b6
Merge branch 'master' into crem

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