projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc316b9 bd5e75f)
Merge branch 'master' into cvs
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Thu, 2 Feb 2012 03:07:03 +0000 (22:07 -0500)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Thu, 2 Feb 2012 03:07:03 +0000 (22:07 -0500)

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