]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Thu, 27 Oct 2011 11:33:09 +0000 (13:33 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 27 Oct 2011 11:33:09 +0000 (13:33 +0200)
commit3b897ce55bc9d3bb840a19c99342086033a567d1
tree29ae972faa8eaccb7220057920e53b9fe77a5fb0
parent58931d3fedece8c19fc14dc74ad2f4629f1720e8
parenta362edfe95abfe9fd5d5a1c4325d6837e024ab0f
Merge branch 'master' into crem

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