]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9df3f57 5ba9f14)
Merge branch 'master' into lam
authoryomguy <yomguy@parisson.com>
Tue, 2 Oct 2012 21:38:07 +0000 (23:38 +0200)
committeryomguy <yomguy@parisson.com>
Tue, 2 Oct 2012 21:38:07 +0000 (23:38 +0200)

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