[Pkg-javascript-commits] [node-iconv] 02/05: Merge tag 'upstream/2.1.10'

[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 40a79d95425d40a8f3cd58588971c6cf7fa548e6
Merge: e84dcc8 d1d0074
Author: Jérémy Lal <kapouer at melix.org>
Date:   Wed Sep 9 13:00:35 2015 +0200

    Merge tag 'upstream/2.1.10'
    
    Upstream version 2.1.10
    
    # gpg: Signature made mer. 09 sept. 2015 13:00:33 CEST using RSA key ID DD39F374
    # gpg: Good signature from "Jérémy Lal <kapouer at melix.org>"
    # gpg:                 aka "Jérémy Lal <jerry at edagames.com>"
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: 03C4 E7AB B880 F524 306E  4815 6611 C05E DD39 F374

 lib/iconv.js   |  3 ++-
 package.json   |  4 ++--
 src/binding.cc | 69 +++++++++++++++++++++++++++++-----------------------------
 3 files changed, 39 insertions(+), 37 deletions(-)

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