]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2574fcb 434d41e)
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Mon, 5 Dec 2011 08:16:34 +0000 (09:16 +0100)
committeryomguy <yomguy@parisson.com>
Mon, 5 Dec 2011 08:16:34 +0000 (09:16 +0100)

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