]> git.parisson.com Git - telecaster-server.git/commitdiff
projects / telecaster-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d0123a d5308d2)
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telecaster-server into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 12 Apr 2013 09:51:10 +0000 (11:51 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 12 Apr 2013 09:51:10 +0000 (11:51 +0200)

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