Merge commit '264f8fdd7f12bd5b9f6813fb8de81c55b6328d9b'

* commit '264f8fdd7f12bd5b9f6813fb8de81c55b6328d9b':
  Update to version 0.5.1

CHANGES.txt

@@ -1,6 +1,16 @@
 Changes
 =======
 
+0.5.1 - Jun 27, 2013
+--------------------
+
+ * use upstream einaros/ws (>=0.4.27) with websockify.js
+ * file_only and no_parent security options for WSRequestHandler
+ * Update build of web-socket-js (c0855c6cae)
+ * add include/web-socket-js-project submodule to gimite/web-socket-js
+   for DSFG compliance.
+ * drop Hixie protocol support
+
 0.4.1 - Mar 12, 2013
 --------------------
 

docs/release.txt

@@ -1,4 +1,4 @@
-- Update setup.py and CHANGES.txt and commit
+- Update setup.py, CHANGES.txt and other/package.json and commit
 - Create version tag and tarball from tag
     WVER=0.1.0
     git tag v${WVER}
@@ -8,3 +8,6 @@
     python setup.py register
 - Upload the source distribution to pypi
     python setup.py sdist upload
+- Register with npmjs.org (once)
+- Upload websockify.js npmjs.org package
+    npm publish other/js

other/js/package.json

@@ -3,7 +3,7 @@
   "name": "websockify",
   "description": "websockify is a WebSocket-to-TCP proxy/bridge",
   "license": "LGPL-3",
-  "version": "0.5.0-pre",
+  "version": "0.5.1",
   "repository": {
     "type": "git",
     "url": "git://github.com/kanaka/websockify.git"

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.5.0-pre'
+version = '0.5.1'
 name = 'websockify'
 long_description = open("README.md").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"