]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0fab0a c1e3f39)
Merge branch 'master' into dev
authoryomguy <yomguy@parisson.com>
Thu, 29 Mar 2012 12:31:29 +0000 (14:31 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 29 Mar 2012 12:31:29 +0000 (14:31 +0200)

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