[Pkg-javascript-commits] [sockjs-client] 349/434: Merge branch 'master' into dev

[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 0880e2955bc657563b4b87773f5a3171e61689b9
Merge: 915f2d4 b87dab0
Author: Marek Majkowski <majek04 at gmail.com>
Date:   Mon Feb 13 14:20:16 2012 +0000

    Merge branch 'master' into dev

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


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