projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aba5304 826af46)
Merge branch 'tova'
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 1 Oct 2008 19:54:10 +0000 (15:54 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 1 Oct 2008 19:54:10 +0000 (15:54 -0400)

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