]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 873c404 678c240)
Merge branch 'cvs' of github.com:schmonz/ikiwiki into cvs
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Tue, 24 Jan 2012 07:40:59 +0000 (02:40 -0500)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Tue, 24 Jan 2012 07:40:59 +0000 (02:40 -0500)

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