Merge branch 'v1.x'
authorJeremiah Senkpiel <fishrock123@rocketmail.com>
Sat, 2 May 2015 00:08:55 +0000 (20:08 -0400)
committerJeremiah Senkpiel <fishrock123@rocketmail.com>
Sat, 2 May 2015 00:08:55 +0000 (20:08 -0400)
commit79a7a86d4d56625fe21be227ecf66ddabc49e86f
treeff327b0d1c0774dbc25247a8ce2ff2a0954425c5
parent30e83d2e84b2a3815bbd6abc22e6abed982fa7db
parentb3a7da10919445c40f1f36868e529bd2f6ea7269
Merge branch 'v1.x'

PR-URL: https://github.com/iojs/io.js/pull/1582
Reviewed-By: Chris Dickinson <christopher.s.dickinson@gmail.com>
Conflicts:
src/node_version.h
src/node_buffer.cc