Merge remote-tracking branch 'ry/v0.10'

Conflicts:
	ChangeLog
	src/node_version.h

diff --cc AUTHORS
index eb271ac,dc1f547..3490ce8
--- 1/AUTHORS
--- 2/AUTHORS
+++ b/AUTHORS
@@@ -454,5 -449,7 +454,8 @@@ Robert Kowalski <rok@kowalski.gd
  Benoit Vallée <github@benoitvallee.net>
  Ryuichi Okumura <okuryu@okuryu.com>
  Brandon Frohs <bfrohs@gmail.com>
 +Nick Sullivan <nick@sullivanflock.com>
  Nathan Zadoks <nathan@nathan7.eu>
+ Rafael Henrique Moreira <rafadev7@gmail.com>
+ Daniel G. Taylor <dan@programmer-art.org>
+ Kiyoshi Nomo <tokyoincidents.g@gmail.com>

diff --cc ChangeLog
index 81e7930,5eb6a5e..0eb9e70
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,65 -1,18 +1,80 @@@
 -2013.05.30, Version 0.10.9 (Stable)
 +2013.05.13, Version 0.11.2 (Unstable)
 +
 +* uv: Upgrade to 0.11.2
 +
 +* V8: Upgrade to 3.19.0
 +
 +* npm: Upgrade to 1.2.21
 +
 +* build: Makefile should respect configure --prefix (Timothy J Fontaine)
 +
 +* cluster: use round-robin load balancing (Ben Noordhuis)
 +
 +* debugger, cluster: each worker has new debug port (Miroslav Bajtoš)
 +
 +* debugger: `restart` with custom debug port (Miroslav Bajtoš)
 +
 +* debugger: breakpoints in scripts not loaded yet (Miroslav Bajtoš)
 +
 +* event: EventEmitter#setMaxListeners() returns this (Sam Roberts)
 +
 +* events: add EventEmitter.defaultMaxListeners (Ben Noordhuis)
 +
 +* install: Support $(PREFIX) install target directory prefix (Olof Johansson)
 +
 +* os: Include netmask in os.networkInterfaces() (Ben Kelly)
 +
 +* path: add path.isAbsolute(path) (Ryan Doenges)
 +
 +* stream: Guarantee ordering of 'finish' event (isaacs)
 +
 +* streams: introduce .cork/.uncork/._writev (Fedor Indutny)
 +
 +* vm: add support for timeout argument (Andrew Paprocki)
 +
 +
 +2013.04.19, Version 0.11.1 (Unstable), 4babd2b46ebf9fbea2c9946af5cfae25a33b2b22
 +
 +* V8: upgrade to 3.18.0
 +
 +* uv: Upgrade to v0.11.1
 +
 +* http: split into multiple separate modules (Timothy J Fontaine)
 +
 +* http: escape unsafe characters in request path (Ben Noordhuis)
 +
 +* url: Escape all unwise characters (isaacs)
 +
 +* build: depend on v8 postmortem-metadata if enabled (Paddy Byers)
 +
 +* etw: update prototypes to match dtrace provider (Timothy J Fontaine)
 +
 +* buffer: change output of Buffer.prototype.toJSON() (David Braun)
 +
 +* dtrace: actually use the _handle.fd value (Timothy J Fontaine)
 +
 +* dtrace: pass more arguments to probes (Dave Pacheco)
 +
 +* build: allow building with dtrace on osx (Dave Pacheco)
 +
 +* zlib: allow passing options to convenience methods (Kyle Robinson Young)
 +
 +
++2013.05.30, Version 0.10.9 (Stable), 878ffdbe6a8eac918ef3a7f13925681c3778060b
+ 
+ * npm: Upgrade to 1.2.24
+ 
+ * uv: Upgrade to v0.10.9
+ 
+ * repl: fix JSON.parse error check (Brian White)
+ 
+ * tls: proper .destroySoon (Fedor Indutny)
+ 
+ * tls: invoke write cb only after opposite read end (Fedor Indutny)
+ 
+ * tls: ignore .shutdown() syscall error (Fedor Indutny)
+ 
+ 
  2013.05.24, Version 0.10.8 (Stable), 30d9e9fdd9d4c33d3d95a129d021cd8b5b91eddb
  
  * v8: update to 3.14.5.9

diff --cc doc/api/fs.markdown
Simple merge

diff --cc lib/repl.js
Simple merge

diff --cc lib/tls.js
Simple merge