projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 43c99f9 5876968)
Merge remote branch 'remotes/smcv/ready/htmlbalance'
authorJoey Hess <joey@kitenet.net>
Mon, 27 Sep 2010 02:44:52 +0000 (22:44 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 27 Sep 2010 02:44:52 +0000 (22:44 -0400)

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