projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 973e49e a64dca8)
Merge commit 'smcv/escape-feed-html'
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 31 Jul 2008 22:49:47 +0000 (18:49 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 31 Jul 2008 22:49:47 +0000 (18:49 -0400)

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