]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e46cfb9 8adad8c)
Merge branch 'master' into dev
authoryomguy <yomguy@parisson.com>
Tue, 2 Oct 2012 21:10:29 +0000 (23:10 +0200)
committeryomguy <yomguy@parisson.com>
Tue, 2 Oct 2012 21:10:29 +0000 (23:10 +0200)

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