[Pkg-javascript-commits] [node-iconv-lite] 08/83: Merge remote-tracking branch 'upstream/master'

[matthew pideil]

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

mpideil-guest pushed a commit to branch master
in repository node-iconv-lite.

commit bc16ab1349eced949a54ae99249f730339d214aa
Merge: 6e9a0ca 25e036a
Author: Jinwu Zhan <jenkinv at 163.com>
Date:   Thu Nov 24 10:16:33 2011 +0800

    Merge remote-tracking branch 'upstream/master'

 README.md         | 10 +++++++---
 index.js          |  4 ++++
 package.json      |  5 ++++-
 test/gbk-test.js  |  2 +-
 test/main-test.js |  4 ++++
 5 files changed, 20 insertions(+), 5 deletions(-)


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