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

Conflicts: lib/buffer.js
nodejs · Mar 5, 2015 · b0425f0 · b0425f0
2 parents 63fbd10 + d01a900
commit b0425f0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;