[Pkg-javascript-commits] [node-async] 435/480: Merge remote-tracking branch 'origin/master'

[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 174cb00704bae2986d529911f755e445e72fa969
Merge: 23691df cdec81f
Author: fritx <uxfritz at 163.com>
Date:   Mon Mar 31 14:29:18 2014 +0800

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	lib/async.js

 README.md          |  46 +++++++++++++++++++
 lib/async.js       |  57 +++++++++++++++++++++--
 package.json       |   2 +-
 test/test-async.js | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 232 insertions(+), 5 deletions(-)

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