[Pkg-javascript-commits] [sockjs-client] 407/434: Merge branch 'master' of github.com:sockjs/sockjs-client

[Tonnerre Lombard]

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

tonnerre-guest pushed a commit to branch master
in repository sockjs-client.

commit fb3af832c7b3bec8f81543260af9b3873562b6fd
Merge: acc64bd 842e72a
Author: Marek Majkowski <majek04 at gmail.com>
Date:   Mon Jun 18 10:48:20 2012 +0100

    Merge branch 'master' of github.com:sockjs/sockjs-client

 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --cc README.md
index 75485cd,351bd4c..1aa36b6
--- a/README.md
+++ b/README.md
@@@ -14,7 -14,7 +14,8 @@@ Work in progress
    * [SockJS-gevent](https://github.com/sdiehl/sockjs-gevent)
    * [pyramid-SockJS](https://github.com/fafhrd91/pyramid_sockjs)
    * [wildcloud-websockets](https://github.com/wildcloud/wildcloud-websockets)
+   * [SockJS-cyclone](https://github.com/flaviogrossi/sockjs-cyclone)
 +  * [SockJS-twisted](https://github.com/Fugiman/sockjs-twisted/)
  
  
  SockJS-client

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