]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b3ef9fa 36ef5af)
Merge branch 'dev'
authoryomguy <yomguy@parisson.com>
Thu, 4 Oct 2012 14:45:36 +0000 (16:45 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 4 Oct 2012 14:45:36 +0000 (16:45 +0200)

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