projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5d56a2 c928a11)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 28 May 2008 19:38:36 +0000 (15:38 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 28 May 2008 19:38:36 +0000 (15:38 -0400)

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