Merge branch 'more' into 1.0.x
authorBrion Vibber <brion@pobox.com>
Fri, 18 Mar 2011 21:06:32 +0000 (14:06 -0700)
committerBrion Vibber <brion@pobox.com>
Fri, 18 Mar 2011 21:06:32 +0000 (14:06 -0700)
commitab6a168d68d9866b5a14b90134bbfba57a36b142
tree472d1b7d864b2d2a8dfe1484473dcb6b5ccaf759
parent5bb6fae307b466b5bb7d709350aa7e6eb5a8bf43
parent4874ab0e7d4509dc7c60ba14df5f9d881a4839f9
Merge branch 'more' into 1.0.x