projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23a3de5 ce4c514)
Merge branch 'master' of git://git.ikiwiki.info
authorSimon McVittie <http://smcv.pseudorandom.co.uk/>
Sat, 12 Jul 2008 21:44:36 +0000 (22:44 +0100)
committerSimon McVittie <http://smcv.pseudorandom.co.uk/>
Sat, 12 Jul 2008 21:44:36 +0000 (22:44 +0100)

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