]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Thu, 27 Oct 2011 12:36:01 +0000 (14:36 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 27 Oct 2011 12:36:01 +0000 (14:36 +0200)
commit8560269ce3da4ac574b3cb8c35ea6397e1c20f61
treebb47e0ca409c6db2f30b0b0e342465eba8a94e14
parent8039f4c760760a5babd888a5035bda846b468660
parenta198ab9cec8208910aa968dd18e16e7a3bb8ca51
Merge branch 'master' into crem

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