Merge remote-tracking branch 'ry/v0.10'
authorisaacs <i@izs.me>
Sat, 17 Aug 2013 20:57:41 +0000 (13:57 -0700)
committerisaacs <i@izs.me>
Sat, 17 Aug 2013 20:57:41 +0000 (13:57 -0700)
commit3b923a7ace319015856d5658a4000f1790de632b
treee584059184061733cf93ae5d1492937e340b7699
parentdfb0461c4cfb21245c06d9a3c5e81bcc2ac45c87
parent0c2960ef4ab83f0eef2fc60c2575403c33ba4c6b
Merge remote-tracking branch 'ry/v0.10'

Conflicts:
AUTHORS
ChangeLog
lib/dgram.js
lib/http.js
src/node_crypto.cc
src/node_version.h
ChangeLog