projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16299db 3d40fd8)
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 14 Mar 2008 22:45:31 +0000 (18:45 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 14 Mar 2008 22:45:31 +0000 (18:45 -0400)

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