projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 54c2e05 e9bc2e9)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 15 Aug 2009 20:34:20 +0000 (16:34 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 15 Aug 2009 20:34:20 +0000 (16:34 -0400)

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