Merge branch 'v0.8.2-release' into v0.8
authorisaacs <i@izs.me>
Mon, 9 Jul 2012 17:23:49 +0000 (10:23 -0700)
committerisaacs <i@izs.me>
Mon, 9 Jul 2012 17:23:49 +0000 (10:23 -0700)
Conflicts:
AUTHORS


Trivial merge