projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc4c1b7 821d9ca)
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 7 Mar 2008 17:25:55 +0000 (12:25 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 7 Mar 2008 17:25:55 +0000 (12:25 -0500)

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