projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dcf342f caa6888)
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 7 Jan 2008 21:40:45 +0000 (16:40 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 7 Jan 2008 21:40:45 +0000 (16:40 -0500)

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