projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 99ec944 9cc28ac)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 25 Jul 2008 16:17:04 +0000 (12:17 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 25 Jul 2008 16:17:04 +0000 (12:17 -0400)

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