Merge remote-tracking branch 'upstream/v0.10'
authorTimothy J Fontaine <tjfontaine@gmail.com>
Thu, 19 Dec 2013 17:33:46 +0000 (09:33 -0800)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Thu, 19 Dec 2013 17:33:46 +0000 (09:33 -0800)
commit5b96d6baf6c29340ed455311127f0d08e49e0236
treec75f3eb46cfc96634cca1756b944dc8a5f7a1d3a
parent59fb0185ec9f3a0a04e6c114c70b6121ab92a4f3
parentf84c7a27765667345935168172493da13b3d84ea
Merge remote-tracking branch 'upstream/v0.10'

Conflicts:
ChangeLog
deps/uv/AUTHORS
deps/uv/ChangeLog
deps/uv/src/version.c
deps/v8/src/log-utils.cc
src/node_version.h
ChangeLog
tools/install.py