projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b4d29b a3ab617)
Merge remote branch 'origin/master'
authorW. Trevor King <wking@drexel.edu>
Wed, 13 Oct 2010 21:20:34 +0000 (17:20 -0400)
committerW. Trevor King <wking@drexel.edu>
Wed, 13 Oct 2010 21:20:34 +0000 (17:20 -0400)

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