]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 721eb43 101f6a1)
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Tue, 14 Feb 2012 15:05:46 +0000 (16:05 +0100)
committeryomguy <yomguy@parisson.com>
Tue, 14 Feb 2012 15:05:46 +0000 (16:05 +0100)
Conflicts:
telemeta/pages/en/help.rst
telemeta/pages/fr/help.rst


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