[Pkg-javascript-commits] [node-iconv] 02/07: Merge tag 'upstream/2.1.11'

[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 a69623b51967e0fef01836cbfc788210c78cd939
Merge: 26200fd 9033acd
Author: Jérémy Lal <kapouer at melix.org>
Date:   Wed Oct 7 09:00:29 2015 +0200

    Merge tag 'upstream/2.1.11'
    
    Upstream version 2.1.11
    
    # gpg: Signature made mer. 07 oct. 2015 09:00:27 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>"

 lib/iconv.js        |  3 +++
 package.json        |  2 +-
 test/test-stream.js | 27 +++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)

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