Added by Ben Noordhuis over 12 years ago
Merge remote-tracking branch 'origin/v0.6'
Conflicts: src/udp_wrap.cc