projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d101269 1f26a1b)
Merge commit 'smcv/master'
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 12 Jul 2008 16:02:57 +0000 (12:02 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 12 Jul 2008 16:02:57 +0000 (12:02 -0400)

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