projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a2979b2 b54b821)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 26 Oct 2009 15:58:25 +0000 (11:58 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 26 Oct 2009 15:58:25 +0000 (11:58 -0400)

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