projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 260d752 cea1890)
Merge branch 'master' into tova
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 2 Jul 2008 22:22:19 +0000 (18:22 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 2 Jul 2008 22:22:19 +0000 (18:22 -0400)

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