]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f016630 a7fa2d1)
Merge branch 'proindex' into pro
authoryomguy <yomguy@parisson.com>
Wed, 9 Jan 2013 20:36:25 +0000 (21:36 +0100)
committeryomguy <yomguy@parisson.com>
Wed, 9 Jan 2013 20:36:25 +0000 (21:36 +0100)

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