]> git.parisson.com Git - telemeta-pages.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)
commit6930a4e6078737b16032121fc29ef0ae95291b14
tree8fbf20b4935103b6a5012cac64eb1f5838c1260e
parent53efa14ed13f47c93e9a629f81996df5e21ee579
parent52b574ff30ea855de119642afc2e2f45de96480e
Merge branch 'master' into crem

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