Merge branch 'v0.10.15-release' into v0.10
authorTimothy J Fontaine <tjfontaine@gmail.com>
Fri, 26 Jul 2013 00:02:38 +0000 (17:02 -0700)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Fri, 26 Jul 2013 00:02:38 +0000 (17:02 -0700)
commit272525714d8670d5c17035e9d728620b126dfb44
treebb3b02e73667334d6ca84f4461ae090971799159
parent015ec05272cf9742bcfaea1f8884e81c31285f5f
parent2426d65af860bda7be9f0832a99601cc43c6cf63
Merge branch 'v0.10.15-release' into v0.10