projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3186551 4b80bb5)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 27 Jul 2009 07:35:49 +0000 (09:35 +0200)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 27 Jul 2009 07:35:49 +0000 (09:35 +0200)

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