projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e204a2c e7a840e)
Merge commit 'smcv/htmlbalance'
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 17 Nov 2008 19:01:28 +0000 (14:01 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 17 Nov 2008 19:01:28 +0000 (14:01 -0500)

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