]> git.parisson.com Git - telecaster-server.git/commitdiff
projects / telecaster-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf517e5 ea1170c)
Merge branch 'master' of git.parisson.com:git/telecaster-server
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 13 Jan 2014 14:51:56 +0000 (15:51 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 13 Jan 2014 14:51:56 +0000 (15:51 +0100)

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