]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 297703e f83b3f6)
Merge branch 'pro' into proindex
authoryomguy <yomguy@parisson.com>
Mon, 7 Jan 2013 23:36:11 +0000 (00:36 +0100)
committeryomguy <yomguy@parisson.com>
Mon, 7 Jan 2013 23:36:11 +0000 (00:36 +0100)

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