openshift/origin-server — pull request #4737 by mrunalp (2014-02-11 21:39:41+00:00)
Title: Bug 1063703: Assume ws if websocket is true.

[merge]