]> git.parisson.com Git - telemeta-pages.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)
commite8104e54e5b3bcc457f328b8df85c2eb0464a268
treee40167d5f94cac6f7dfc6bbbc6d41fac7b6472ce
parentca0c3104ccfeeabdb78053e0299691d9f887f8e1
parent8297f92cc3cbd532b671ebf372d23dae2187a4a3
Merge branch 'master' into crem

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