Merge remote-tracking branch 'ry/v0.8' into master
authorisaacs <i@izs.me>
Sat, 9 Mar 2013 02:59:44 +0000 (18:59 -0800)
committerisaacs <i@izs.me>
Sat, 9 Mar 2013 02:59:44 +0000 (18:59 -0800)
commit061a7ddbff06b5ae313f9a8357993b9b44b522f2
treeeebb25618078723b205fdcf5e2cbb8b705106b77
parent6e34dfd9e80b82180d3fdfaee9623ed06ff562a4
parentd5959c5ceae6cc65d5e756d86fafe69b7487b15a
Merge remote-tracking branch 'ry/v0.8' into master

Conflicts:
AUTHORS
ChangeLog
src/node_version.h
ChangeLog