Merge remote-tracking branch 'upstream/v0.10' into v0.12

Conflicts: lib/buffer.js
10 years ago · b0425f0d2c
1 changed files with 1 additions and 1 deletions
--- a/lib/buffer.js
+++ b/lib/buffer.js
@ -187,7 +187,7 @@ Buffer.isEncoding = function(encoding) {

 Buffer.concat = function(list, length) {
  if (!util.isArray(list))
-    throw new TypeError('Usage: Buffer.concat(list[, length])');
+    throw new TypeError('list argument must be an Array of Buffers.');

  if (util.isUndefined(length)) {
    length = 0;