Merge remote-tracking branch 'origin/v0.8'
authorBen Noordhuis <info@bnoordhuis.nl>
Thu, 3 Jan 2013 19:02:31 +0000 (20:02 +0100)
committerBen Noordhuis <info@bnoordhuis.nl>
Thu, 3 Jan 2013 19:02:31 +0000 (20:02 +0100)
commita7d8c21bca112a83a711b89e432a2486f0049557
treebc233327d8c5279b887ccbb4f558c19d519f701c
parentaad2013508eae5ee29a410c6fe44d27d6470ad24
parent50e88d0b66adda159739c6f1a875c255924e108d
Merge remote-tracking branch 'origin/v0.8'

Conflicts:
configure
deps/uv/src/unix/core.c
deps/uv/test/test-fs-event.c
src/node_version.h