projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af8e847 c2f621c)
Merge branch 'tova'
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 24 Jul 2008 16:37:17 +0000 (12:37 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 24 Jul 2008 16:37:17 +0000 (12:37 -0400)

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