projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1b7a21 a130384)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 11 Jul 2009 04:33:32 +0000 (00:33 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 11 Jul 2009 04:33:32 +0000 (00:33 -0400)

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