projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2269cfd 0c26e50)
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 2 Jan 2008 00:10:21 +0000 (19:10 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 2 Jan 2008 00:10:21 +0000 (19:10 -0500)

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