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)
commit1334695f4ca8a08ea94c176f5cc4c1fafa7aa31c
treea091c23c70e71b3c5b77aa6e7cb1bb12c326b703
parent43c99f907674de2207a7b411ee1b0c2996ce79d2
parent5876968fa1ff1225542d2afd836d1027276bab44
Merge remote branch 'remotes/smcv/ready/htmlbalance'