[Pkg-javascript-commits] [node-ws] 03/06: Merge tag 'upstream/0.7.2+ds1.349b7460'

[Ximin Luo]

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

infinity0-guest pushed a commit to branch master
in repository node-ws.

commit a3f037a70b6e2477033c2be8361f6d49cbd937d8
Merge: 4d852bd 0fad03c
Author: Ximin Luo <infinity0 at pwned.gg>
Date:   Wed Jun 17 19:01:47 2015 +0200

    Merge tag 'upstream/0.7.2+ds1.349b7460'
    
    Upstream version 0.7.2+ds1.349b7460
    
    # gpg: Signature made Wed 17 Jun 2015 19:01:47 CEST
    # gpg:                using RSA key 860DEF3B8F650B79
    # gpg: Good signature from "Ximin Luo <infinity0 at pwned.gg>" [ultimate]
    # gpg:                 aka "Ximin Luo <infinity0 at torproject.org>" [ultimate]
    # gpg:                 aka "Ximin Luo <infinity0 at freenetproject.org>" [ultimate]

 .travis.yml                  | 18 +++++++++++++++++-
 README.md                    | 15 +++++++++++----
 dependency.versions          |  8 ++++----
 doc/ws.md                    | 23 +++++++++++++++++++++--
 lib/WebSocket.js             |  7 +++----
 node_modules/ultron/index.js | 10 +++++++---
 package.json                 |  8 ++++----
 test/WebSocket.test.js       | 36 ++++++++++++++++++++++++++++++++++--
 8 files changed, 101 insertions(+), 24 deletions(-)

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