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

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