projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f6e6d56 2d6263b)
Merge branch 'master' of git://git.ikiwiki.info into css
authorSimon McVittie <http://smcv.pseudorandom.co.uk/>
Sun, 13 Jul 2008 14:32:49 +0000 (15:32 +0100)
committerSimon McVittie <http://smcv.pseudorandom.co.uk/>
Sun, 13 Jul 2008 14:32:49 +0000 (15:32 +0100)

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