]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Thu, 17 Nov 2011 08:57:03 +0000 (09:57 +0100)
committeryomguy <yomguy@parisson.com>
Thu, 17 Nov 2011 08:57:03 +0000 (09:57 +0100)
commit69cf1fbe03a2476d14c63788e59446e809f4589c
tree2ec76df28f79ba04c8161a286aa01eecd6703282
parent66771a3c47ac7f91b0129eb809b65549b68e30c1
parent4a5aa1d6aa2be97245c3ea673be3ecb6078d08f4
Merge branch 'master' into crem

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