[Pkg-privacy-commits] [pt-websocket] 05/12: Merge tag 'upstream/0.2'

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository pt-websocket.

commit 88850ea0a4b2abb28dd0265d6087d1c53de5f1d2
Merge: 671fd77 e86c247
Author: Ximin Luo <infinity0 at pwned.gg>
Date:   Thu May 22 11:49:26 2014 +0100

    Merge tag 'upstream/0.2'
    
    Upstream version 0.2
    
    # gpg: Signature made Thu 22 May 2014 11:49:26 BST
    # gpg:                using RSA key 860DEF3B8F650B79
    # gpg: Good signature from "Ximin Luo <infinity0 at pwned.gg>"
    # gpg:                 aka "Ximin Luo <infinity0 at gmx.com>"
    # gpg:                 aka "Ximin Luo <infinity0 at torproject.org>"
    # gpg:                 aka "Ximin Luo <infinity0 at freenetproject.org>"

 .gitignore                                         |  4 ++--
 Makefile                                           | 22 +++++++++++-----------
 README                                             |  2 +-
 .../pt-websocket-client.go                         |  0
 .../pt-websocket-server.go                         |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/pt-websocket.git