projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a2e4e1 5757ad8)
Merge branch 'master' of git://git.ikiwiki.info
authorJon Dowland <jon@alcopop.org>
Fri, 16 Oct 2009 09:59:56 +0000 (10:59 +0100)
committerJon Dowland <jon@alcopop.org>
Fri, 16 Oct 2009 09:59:56 +0000 (10:59 +0100)

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