projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8a29361 848dc81)
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 17 Mar 2008 18:05:21 +0000 (14:05 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 17 Mar 2008 18:05:21 +0000 (14:05 -0400)

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