]> git.parisson.com Git - telecaster-server.git/commitdiff
projects / telecaster-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da6f9f0 b3e5016)
Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/telecaster-server into dev
authoryomguy <yomguy@parisson.com>
Tue, 23 Oct 2012 15:18:12 +0000 (17:18 +0200)
committeryomguy <yomguy@parisson.com>
Tue, 23 Oct 2012 15:18:12 +0000 (17:18 +0200)

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