Added by isaacs almost 11 years ago
Merge remote-tracking branch 'ry/v0.10'
Conflicts: ChangeLog src/node_version.h