projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 744642d c8f7b96)
Merge branch 'master' of git://git.ikiwiki.info
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Sun, 5 Feb 2012 21:38:52 +0000 (16:38 -0500)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Sun, 5 Feb 2012 21:38:52 +0000 (16:38 -0500)

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