projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a64b224 bfda13f)
Merge branch 'master' of git://git.ikiwiki.info into cvs
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Tue, 24 Jan 2012 07:40:43 +0000 (02:40 -0500)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Tue, 24 Jan 2012 07:40:43 +0000 (02:40 -0500)

Trivial merge
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.