Commit updated README.md
Bump version to 1.5next
Merge branch 'master' into develop
Merge branch 'debian' into debian-develop
Merge branch 'develop' into debian-develop
passwd: Replace unused variable
Merge pull request #1 from psomas/develop

Merge 1.5 release changes into develop
Merge pull request #2 from psomas/debian-develop

Merge 1.5 release changes into debian-develop
Add Websockets support
Add a sample flashpolicy server (from Adobe)
Update control file wrt the new WebSocket functionality
Install flashpolicy server in examples
Bump version to 1.6rc1
Add release date for v1.6
docs: Fix typos
debian/control: 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