projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6857ee1 165d164)
Merge remote branch 'public/master'
authorW. Trevor King <wking@drexel.edu>
Tue, 5 Oct 2010 13:39:03 +0000 (09:39 -0400)
committerW. Trevor King <wking@drexel.edu>
Tue, 5 Oct 2010 13:39:03 +0000 (09:39 -0400)

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