projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac61907 beb8c74)
Merge branch 'master' of git://git.ikiwiki.info
authorJon Dowland <jon+ikiwiki@alcopop.org>
Wed, 11 Nov 2009 19:12:47 +0000 (19:12 +0000)
committerJon Dowland <jon+ikiwiki@alcopop.org>
Wed, 11 Nov 2009 19:12:47 +0000 (19:12 +0000)

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