]> git.parisson.com Git - telemeta.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)
commit3afcd544d7dd6f6c5436dd58c4f43849175962eb
tree0ecafd27ab55f634e042396f6d052e61b299ba7e
parent721eb43967fedc832519ff4ff9426d69fbd5609c
parent101f6a1cdb41c6ec6f3feaa7ba3bccc83b9b9d4a
Merge branch 'master' into crem

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