projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4026650 85844b8)
Merge commit 'schmonz/master' into cvs
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 2 Sep 2009 19:36:16 +0000 (15:36 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 2 Sep 2009 19:36:16 +0000 (15:36 -0400)

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