projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4e8489a 64645c4)
Merge branch 'master' of ssh://einstein/~/public_html/code/git/ikiwiki
authorW. Trevor King <wking@drexel.edu>
Wed, 13 Oct 2010 21:27:32 +0000 (17:27 -0400)
committerW. Trevor King <wking@drexel.edu>
Wed, 13 Oct 2010 21:27:32 +0000 (17:27 -0400)

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