[Pkg-javascript-commits] [node-iconv] 02/08: 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-iconv.

commit c81a66f3333ab9d5aa65123e19c998ac488bf31e
Merge: eeaacf9 dc9d6e8
Author: Jérémy Lal <kapouer at melix.org>
Date:   Sat Sep 10 10:41:42 2016 +0200

    Merge tag 'upstream/2.2.1'
    
    Upstream version 2.2.1
    
    # gpg: Signature faite le sam. 10 sept. 2016 10:41:39 CEST
    # gpg:                avec la clef RSA 6611C05EDD39F374
    # gpg:                issuer "kapouer at melix.org"
    # gpg: Bonne signature de « Jérémy Lal <kapouer at melix.org> » [ultime]
    # gpg:                 alias « Jérémy Lal <jerry at edagames.com> » [ultime]
    # gpg:                 alias « Jérémy Lal <jerry at eda.sarl> » [ultime]

 README.md          |  9 ++++--
 binding.gyp        | 81 +++++++++++++++++++++++++++---------------------------
 lib/iconv.js       |  7 ++++-
 package.json       |  4 +--
 src/binding.cc     |  8 ++++--
 test/test-basic.js | 23 ++++++++++++++++
 6 files changed, 84 insertions(+), 48 deletions(-)

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