projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ebea77 49fac7f)
Merge commit 'origin/master'
authorSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Tue, 15 Jul 2008 00:27:17 +0000 (01:27 +0100)
committerSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Tue, 15 Jul 2008 00:27:17 +0000 (01:27 +0100)

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