projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ddd5503 8effd48)
Merge branch 'master' of git://git.ikiwiki.info
authorJon Dowland <jon@ra.ncl.ac.uk>
Tue, 21 Jul 2009 10:45:29 +0000 (11:45 +0100)
committerJon Dowland <jon@ra.ncl.ac.uk>
Tue, 21 Jul 2009 10:45:29 +0000 (11:45 +0100)

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