Merge v1.8.1.
authorChris Dickinson <christopher.s.dickinson@gmail.com>
Tue, 21 Apr 2015 03:25:08 +0000 (20:25 -0700)
committerChris Dickinson <christopher.s.dickinson@gmail.com>
Tue, 21 Apr 2015 03:25:08 +0000 (20:25 -0700)
commit59a5c98f2c987080634ed078c9868e23e8c55820
tree9135de0054cfc4caf12888a1d93fbb8476f565e7
parent6bf85bc81e7e61b4126c50d05555d5928343423b
parent7b7da2edf79a95aa9ab2b7ff6dc74557d4cd0d64
Merge v1.8.1.

This brings in the '%PYTHON%' revert, and restores
the correct NODE_MODULE_VERSION.

PR-URL: https://github.com/iojs/io.js/pull/1482
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
src/node_version.h