Merge branch 'master' of github.com:maker/ratchet
authorDave Gamache <dhgamache@gmail.com>
Mon, 5 Nov 2012 00:32:17 +0000 (16:32 -0800)
committerDave Gamache <dhgamache@gmail.com>
Mon, 5 Nov 2012 00:32:17 +0000 (16:32 -0800)

Trivial merge