projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 88d4fb1 8229345)
Merge commit 'jonas/master'
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 22 Jul 2009 22:37:22 +0000 (00:37 +0200)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 22 Jul 2009 22:37:22 +0000 (00:37 +0200)

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