[Pkg-javascript-commits] [node-nan] 02/06: Merge tag 'upstream/2.2.1'

[Jérémy Lal]

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

kapouer pushed a commit to branch master
in repository node-nan.

commit f578eba1ed055720d2268c877a2d7efe91443f55
Merge: 9b3c4ef 4260d6d
Author: Jérémy Lal <kapouer at melix.org>
Date:   Thu Mar 31 13:48:40 2016 +0200

    Merge tag 'upstream/2.2.1'
    
    Upstream version 2.2.1
    
    # gpg: Signature faite le jeu. 31 mars 2016 13:48:37 CEST avec la clef RSA d'identifiant DD39F374
    # gpg: Bonne signature de « Jérémy Lal <kapouer at melix.org> »
    # gpg:                 alias « Jérémy Lal <jerry at edagames.com> »
    # gpg:                 alias « Jérémy Lal <jerry at eda.sarl> »

 CHANGELOG.md                        |  7 +++++-
 README.md                           |  2 +-
 examples/async_pi_estimate/addon.js | 50 ++++++++++++++++++-------------------
 nan.h                               | 20 +++++----------
 nan_callbacks_pre_12_inl.h          |  2 +-
 package.json                        |  2 +-
 test/cpp/returnvalue.cpp            |  8 ++++++
 test/js/returnvalue-test.js         |  4 ++-
 8 files changed, 51 insertions(+), 44 deletions(-)

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