Merge branch 'v0.6.15-release' into v0.6
authorisaacs <i@izs.me>
Mon, 9 Apr 2012 17:34:32 +0000 (10:34 -0700)
committerisaacs <i@izs.me>
Mon, 9 Apr 2012 17:34:32 +0000 (10:34 -0700)
commit163d3cdf142576462b187b68f1c8016d989b43ab
tree4e7fa0c7bfffadfa8345b8f2ee86f8b94a7944cb
parent45b772d8cb3fb2c3a4a07f30056879bc054ee627
parentf160a45b254e591eb33716311c92be533c6d86c4
Merge branch 'v0.6.15-release' into v0.6