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)
PR-URL: https://github.com/iojs/io.js/pull/1582
Reviewed-By: Chris Dickinson <christopher.s.dickinson@gmail.com>
Conflicts:
src/node_version.h

1  2 
src/node_buffer.cc

Simple merge