projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 247d3d6 aef14ad)
Merge remote branch 'origin/org'
authorW. Trevor King <wking@drexel.edu>
Wed, 6 Oct 2010 11:22:53 +0000 (07:22 -0400)
committerW. Trevor King <wking@drexel.edu>
Wed, 6 Oct 2010 11:22:53 +0000 (07:22 -0400)

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