]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Fri, 28 Oct 2011 12:07:59 +0000 (14:07 +0200)
committeryomguy <yomguy@parisson.com>
Fri, 28 Oct 2011 12:07:59 +0000 (14:07 +0200)
commit14a64414c0f4cd6c0be5371747b454cd461fd940
tree5e70df50d1e788661647cfa1eb2782619e59cb22
parent42331f09d5edd5bc7a8bf38c32ad6c0b4895dc40
parentcf76d3763897573b6026cdb4d1f4d6a8135d3e2f
Merge branch 'master' into crem

Conflicts:
telemeta/pages/fr/home.rst