[Pkg-javascript-commits] [sockjs-client] 06/22: Merge branch 'cons_without_new' of https://github.com/squaremo/sockjs-client

[Tonnerre Lombard]

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

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

commit b1d3b559b72c49f848e777c8bd5d87ee49f24cd2
Merge: e900174 ec1632f
Author: Marek Majkowski <majek04 at gmail.com>
Date:   Sat Dec 29 03:44:50 2012 +0000

    Merge branch 'cons_without_new' of https://github.com/squaremo/sockjs-client

 lib/sockjs.js               |  2 +-
 tests/html/src/tests.coffee | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

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