Merge branch 'v0.8.5-release' into v0.8
authorisaacs <i@izs.me>
Thu, 2 Aug 2012 21:57:34 +0000 (14:57 -0700)
committerisaacs <i@izs.me>
Thu, 2 Aug 2012 21:57:34 +0000 (14:57 -0700)
1  2 
Makefile

diff --cc Makefile
Simple merge