]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fba0860 242fcb0)
Merge branch 'master' into lam
authoryomguy <yomguy@parisson.com>
Mon, 17 Sep 2012 16:48:03 +0000 (18:48 +0200)
committeryomguy <yomguy@parisson.com>
Mon, 17 Sep 2012 16:48:03 +0000 (18:48 +0200)

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