projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 80f95cc 3ac17b8)
Merge commit 'origin/master' into tova
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 22 Jul 2008 17:17:04 +0000 (13:17 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 22 Jul 2008 17:17:04 +0000 (13:17 -0400)

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