projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0da57d2 6683a1d)
Merge branch 'master' of git://git.ikiwiki.info
authorJon Dowland <jon@ra.ncl.ac.uk>
Tue, 2 Dec 2008 15:08:55 +0000 (15:08 +0000)
committerJon Dowland <jon@ra.ncl.ac.uk>
Tue, 2 Dec 2008 15:08:55 +0000 (15:08 +0000)

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