[Pkg-javascript-commits] [node-zip-stream] 03/06: Imported Upstream version 0.3.6

[Andrew Kelley]

This is an automated email from the git hooks/post-receive script.

andrewrk-guest pushed a commit to branch master
in repository node-zip-stream.

commit 40a18356d01b23a05bf4502b3abeb1daca30b2c4
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Fri Jul 4 16:35:00 2014 +0000

    Imported Upstream version 0.3.6
---
 README.md         | 2 +-
 lib/util/index.js | 4 ++--
 package.json      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 202d731..ce49843 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# zip-stream v0.3.5 [![Build Status](https://travis-ci.org/ctalkington/node-zip-stream.svg?branch=master)](https://travis-ci.org/ctalkington/node-zip-stream)
+# zip-stream v0.3.6 [![Build Status](https://travis-ci.org/ctalkington/node-zip-stream.svg?branch=master)](https://travis-ci.org/ctalkington/node-zip-stream)
 
 zip-stream is a streaming zip archive generator. It was built to be a successor to [zipstream](https://npmjs.org/package/zipstream). Dependencies are kept to a minimum through the use of many of node's built-in modules including the use of zlib module for compression.
 
diff --git a/lib/util/index.js b/lib/util/index.js
index 07df06d..03ce186 100644
--- a/lib/util/index.js
+++ b/lib/util/index.js
@@ -11,7 +11,7 @@ var path = require('path');
 var Stream = require('stream').Stream;
 var PassThrough = require('readable-stream').PassThrough;
 
-var loDefaults = require('lodash.defaults');
+var _ = require('lodash');
 
 var util = module.exports = {};
 
@@ -47,7 +47,7 @@ util.defaults = function(object, source, guard) {
   var args = arguments;
   args[0] = args[0] || {};
 
-  return loDefaults.apply(null, args);
+  return _.defaults.apply(_, args);
 };
 
 util.dosDateTime = function(d, utc) {
diff --git a/package.json b/package.json
index 0bd5b5c..51428d2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zip-stream",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "description": "a streaming zip archive generator.",
   "homepage": "https://github.com/ctalkington/node-zip-stream",
   "author": {
@@ -36,7 +36,7 @@
     "crc32-stream": "~0.2.0",
     "debug": "~1.0.2",
     "deflate-crc32-stream": "~0.1.0",
-    "lodash.defaults": "~2.4.1",
+    "lodash": "~2.4.1",
     "readable-stream": "~1.0.26"
   },
   "devDependencies": {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-zip-stream.git