[Pkg-javascript-commits] [sockjs-client] 264/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 9e13cad30c7db01ef608392203e66ef06edcf2f3
Merge: 9b3321c c94c762
Author: Marek Majkowski <majek04 at gmail.com>
Date:   Tue Dec 20 15:23:34 2011 +0000

    Merge branch 'master' into dev

 README.md | 3 +++
 1 file changed, 3 insertions(+)


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