]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c69fbf3 febc7d0)
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/teleforma into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Sun, 29 Jul 2012 18:09:04 +0000 (20:09 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Sun, 29 Jul 2012 18:09:04 +0000 (20:09 +0200)

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