Merge branch 'v0.10.12-release' into v0.10
authorisaacs <i@izs.me>
Tue, 18 Jun 2013 18:13:26 +0000 (11:13 -0700)
committerisaacs <i@izs.me>
Tue, 18 Jun 2013 18:13:26 +0000 (11:13 -0700)
commit59dde8192636ad8eeeab43927d43f34d428a6cc8
tree81e3c2e79cbdb373c2a1282274621e22a51fcf68
parent9195455637be7ac68274c4e9a83003470efdb0c0
parenta088cf4f930d3928c97d239adf950ab43e7794aa
Merge branch 'v0.10.12-release' into v0.10