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

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