projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51d0aa4 111db0b)
Merge branch 'master' into cvs
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Tue, 31 Jan 2012 01:56:51 +0000 (19:56 -0600)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Tue, 31 Jan 2012 01:56:51 +0000 (19:56 -0600)

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