Merge remote-tracking branch 'upstream/v0.10'
authorTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 20 Nov 2013 23:45:50 +0000 (15:45 -0800)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 20 Nov 2013 23:45:50 +0000 (15:45 -0800)
commiteaba9417b118c072191705d11c02ebce3326ed6a
treeab0f350b7ba4e1c8c72d57a75bb53b6ea56bec81
parent40d5e9074a0001d53901df2a2e081c8821b3dc22
parentc1452f4c6fac17dd8ab974372daee05cd5cdbdec
Merge remote-tracking branch 'upstream/v0.10'

Conflicts:
lib/events.js
src/udp_wrap.cc
doc/api/crypto.markdown
doc/api/net.markdown
lib/events.js