projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1c4899 2eba6f2)
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 4 Feb 2008 22:59:07 +0000 (17:59 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 4 Feb 2008 22:59:07 +0000 (17:59 -0500)

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