From: Joey Hess <joey@kitenet.net>
Date: Mon, 27 Sep 2010 02:44:52 +0000 (-0400)
Subject: Merge remote branch 'remotes/smcv/ready/htmlbalance'
X-Git-Tag: 3.20100926~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1334695f4ca8a08ea94c176f5cc4c1fafa7aa31c;p=ikiwiki.git

Merge remote branch 'remotes/smcv/ready/htmlbalance'
---

1334695f4ca8a08ea94c176f5cc4c1fafa7aa31c