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

Conflicts:
telemeta/pages/fr/home.rst