]> git.parisson.com Git - telemeta-pages.git/commitdiff
projects / telemeta-pages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8104e5 e91231f)
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)
Conflicts:
telemeta/pages/fr/home.rst


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.