]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1dfbe68 cc00c81)
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Tue, 6 Dec 2011 23:05:06 +0000 (00:05 +0100)
committeryomguy <yomguy@parisson.com>
Tue, 6 Dec 2011 23:05:06 +0000 (00:05 +0100)

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