projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 14b59ca 57035d6)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 12 Apr 2008 21:12:40 +0000 (17:12 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 12 Apr 2008 21:12:40 +0000 (17:12 -0400)

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