projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd80ca3 5c669ab)
Merge commit 'origin/comments' into comments-joey
authorSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Sun, 21 Dec 2008 10:17:45 +0000 (10:17 +0000)
committerSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Sun, 21 Dec 2008 10:17:45 +0000 (10:17 +0000)

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