projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e81e066 4dc18da)
Merge branch 'master' of git://git.ikiwiki.info
authorJon Dowland <jon@alcopop.org>
Wed, 1 Apr 2009 22:13:32 +0000 (23:13 +0100)
committerJon Dowland <jon@alcopop.org>
Wed, 1 Apr 2009 22:13:32 +0000 (23:13 +0100)

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