passwd: Replace unused variable
Merge pull request #1 from psomas/develop

Merge 1.5 release changes into develop
Add Websockets support
Add a sample flashpolicy server (from Adobe)
Bump version to 1.6rc1
Add release date for v1.6
docs: Fix typos
Merge branch 'release-1.6' into debian-release-1.6
Bump version to 1.6~rc1-1~wheezy

Signed-off-by: Ilias Tsitsimpis <iliastsi@grnet.gr>
Bump version to 1.6rc2
proxy: Workaround for threading lib bug

In order to avoid an exception from the threading library (due to a bug,
fixed in Python 3.3), we should make sure to call patch_thread() before
threading gets imported (it is first imported by the logging module, in
proxy.py) [1][2].

[1] http://bugs.python.org/issue1596321
[2] http://stackoverflow.com/questions/8774958/keyerror-in-module-threading-after-a-successful-py-test-run
Add console_script entry point for client
Make the proxy listen address configurable
Return FQDN when proxying to all addresses

Make VNCAuthProxy return the FQDN of the server when it is proxying
connections to all addresses, because returning '*' to the client is
useless for the client.
Merge branch 'release-1.6' into debian-release-1.6