Merge 'node/v0.12'
authorBert Belder <bertbelder@gmail.com>
Tue, 9 Dec 2014 17:06:35 +0000 (18:06 +0100)
committerBert Belder <bertbelder@gmail.com>
Tue, 9 Dec 2014 17:06:35 +0000 (18:06 +0100)
commit1afa8629789ae133d0bc1502ae4fe0bec4e6f262
tree1f567e2b6f28b4a208922f0cd6d8766c1df2ab20
parent2b6a0f85f3fafa8afee0ddf09c50ebc5f3a7c6a8
parent70195acbe36f56b87d697a16b5bfc2699c89bac5
Merge 'node/v0.12'

This merge is effectively a no-op because io.js has already
cherry-picked all the patches from node it needs.

The merge commit serves to establish a new merge base for future merges.