Merge remote-tracking branch 'ry/v0.8'
authorisaacs <i@izs.me>
Thu, 26 Jul 2012 18:58:03 +0000 (11:58 -0700)
committerisaacs <i@izs.me>
Thu, 26 Jul 2012 18:58:03 +0000 (11:58 -0700)
commite5498331f443fc8bd4dcf82f2a41e669dfe66cc9
tree500c67e2940acc8b934aabdffdf33c23144809cc
parentfebffc107d8748b8b71e6a1b00b15dd430023887
parentb0c0111b04201bf99fde0fe0616b9fdf1f33655d
Merge remote-tracking branch 'ry/v0.8'

Conflicts:
AUTHORS
ChangeLog
src/node_version.h
AUTHORS
ChangeLog
lib/net.js
lib/readline.js