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

[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 e6489c89f4e3c1671994f8bec289fcbc6d4b7129
Merge: 1eb96e3 10d2327
Author: Marek Majkowski <majek04 at gmail.com>
Date:   Thu Nov 15 13:27:18 2012 +0000

    Merge branch 'master' into dev-new

 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