projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 65c9840 ec8f5a3)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 9 Jul 2008 04:25:15 +0000 (00:25 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 9 Jul 2008 04:25:15 +0000 (00:25 -0400)

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