projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: abf9f16 6e2dc2b)
Merge branch 'master' into tova
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 6 Jul 2008 21:34:30 +0000 (17:34 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 6 Jul 2008 21:34:30 +0000 (17:34 -0400)

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