projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9ef40a 1e29491)
Merge branch 'master' of git://git.ikiwiki.info
authorW. Trevor King <wking@drexel.edu>
Mon, 4 Oct 2010 17:31:28 +0000 (13:31 -0400)
committerW. Trevor King <wking@drexel.edu>
Mon, 4 Oct 2010 17:31:28 +0000 (13:31 -0400)

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