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.
This commit is contained in:
commit
1afa862978