Merge branch 'v0.10.6-release' into v0.10
authorisaacs <i@izs.me>
Tue, 14 May 2013 21:33:33 +0000 (14:33 -0700)
committerisaacs <i@izs.me>
Tue, 14 May 2013 21:33:33 +0000 (14:33 -0700)
commitd855e9b1253c6869510790fb7e92c57c29508e8a
treec7f576c2313b1d0ce4d6f5e37d668b9ce30381e7
parenta241deb19a6f5a8e95909127858b7b26cd64ae93
parent5deb1672f2b5794f8be19498a425ea4dc0b0711f
Merge branch 'v0.10.6-release' into v0.10