From: Joey Hess 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.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/1334695f4ca8a08ea94c176f5cc4c1fafa7aa31c?hp=1334695f4ca8a08ea94c176f5cc4c1fafa7aa31c Merge remote branch 'remotes/smcv/ready/htmlbalance' ---