projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a7c3d1 2306824)
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 3 Feb 2008 04:41:33 +0000 (23:41 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 3 Feb 2008 04:41:33 +0000 (23:41 -0500)

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