[Pkg-javascript-commits] [node-async] 136/480: Merge https://github.com/pistolero/async into pistolero

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository node-async.

commit bb07255f3c54ccb7efdcd798a77c99984d91119b
Merge: 6663ac8 5d444b7
Author: Caolan McMahon <caolan at caolanmcmahon.com>
Date:   Sun Feb 12 17:35:35 2012 -0800

    Merge https://github.com/pistolero/async into pistolero
    
    Conflicts:
    	lib/async.js

 lib/async.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --cc lib/async.js
index c862008,6d83126..9b610f6
--- a/lib/async.js
+++ b/lib/async.js
@@@ -382,8 -345,9 +382,9 @@@
          };
  
          addListener(function () {
 -            if (completed.length === keys.length) {
 -                callback(null);
 +            if (_keys(results).length === keys.length) {
 +                callback(null, results);
+                 callback = function () {};
              }
          });
  

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