projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ba4fa7 c82ca7a)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 14 Oct 2009 17:20:55 +0000 (13:20 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 14 Oct 2009 17:20:55 +0000 (13:20 -0400)

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