projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 652beaf 09a5cdb)
Merge commit 'smcv/master'
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 21 Jul 2008 21:05:40 +0000 (17:05 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 21 Jul 2008 21:05:40 +0000 (17:05 -0400)

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