[Pkg-javascript-commits] [sockjs-client] 255/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 6928933c2bfe51d996e3b51af3970710373586ee
Merge: 3e9a290 67af34f
Author: Marek Majkowski <majek04 at gmail.com>
Date:   Mon Dec 12 12:29:42 2011 +0000

    Merge branch 'master' into dev

 Changelog | 8 ++++----
 version   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

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