projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7eae018 1b7c3fe)
Merge remote branch 'origin/master'
authorW. Trevor King <wking@drexel.edu>
Wed, 6 Oct 2010 13:35:17 +0000 (09:35 -0400)
committerW. Trevor King <wking@drexel.edu>
Wed, 6 Oct 2010 13:35:17 +0000 (09:35 -0400)

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