]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6bbfa4c 149cd67)
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/teleforma into dev
authoryomguy <yomguy@parisson.com>
Sat, 28 Jul 2012 22:24:08 +0000 (00:24 +0200)
committeryomguy <yomguy@parisson.com>
Sat, 28 Jul 2012 22:24:08 +0000 (00:24 +0200)

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