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

[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 58dca5a32ae1e10c5fe6031353549c54658d80ac
Merge: aa837d7 9e116c4
Author: Caolan McMahon <caolan at caolanmcmahon.com>
Date:   Sat Oct 29 15:37:30 2011 -0700

    Merge https://github.com/allanca/async into allanca
    
    Conflicts:
    	dist/async.min.js

 README.md          |  9 ++++++---
 dist/async.min.js  |  2 +-
 lib/async.js       | 18 +++++++++++-------
 test/test-async.js | 36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 54 insertions(+), 11 deletions(-)

diff --cc dist/async.min.js
index aeff837,9d73af6..3b34d30
--- a/dist/async.min.js
+++ b/dist/async.min.js
@@@ -1,1 -1,1 +1,1 @@@
- /*global setTimeout: false, console: false */(function(){var a={},b=this,c=b.async;typeof module!="undefined"&&module.exports?module.exports=a:b.async=a,a.noConflict=function(){return b.async=c,a};var d=function(a,b){if(a.forEach)return a.forEach(b);for(var c=0;c<a.length;c+=1)b(a[c],c,a)},e=function(a,b){if(a.map)return a.map(b);var c=[];return d(a,function(a,d,e){c.push(b(a,d,e))}),c},f=function(a,b,c){return a.reduce?a.reduce(b,c):(d(a,function(a,d,e){c=b(c,a,d,e)}),c)},g=function(a) [...]
 -/*global setTimeout: false, console: false */(function(){var a={},b=this,c=b.async;typeof module!="undefined"&&module.exports?module.exports=a:b.async=a,a.noConflict=function(){b.async=c;return a};var d=function(a,b){if(a.forEach)return a.forEach(b);for(var c=0;c<a.length;c+=1)b(a[c],c,a)},e=function(a,b){if(a.map)return a.map(b);var c=[];d(a,function(a,d,e){c.push(b(a,d,e))});return c},f=function(a,b,c){if(a.reduce)return a.reduce(b,c);d(a,function(a,d,e){c=b(c,a,d,e)});return c},g=fun [...]
++/*global setTimeout: false, console: false */(function(){var a={},b=this,c=b.async;typeof module!="undefined"&&module.exports?module.exports=a:b.async=a,a.noConflict=function(){return b.async=c,a};var d=function(a,b){if(a.forEach)return a.forEach(b);for(var c=0;c<a.length;c+=1)b(a[c],c,a)},e=function(a,b){if(a.map)return a.map(b);var c=[];return d(a,function(a,d,e){c.push(b(a,d,e))}),c},f=function(a,b,c){return a.reduce?a.reduce(b,c):(d(a,function(a,d,e){c=b(c,a,d,e)}),c)},g=function(a) [...]

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