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

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