Merge branch 'master' into develop

Conflicts:
	docs/changes.rst
	mopidy/__init__.py
	mopidy/audio/__init__.py
	mopidy/backends/dummy.py
	mopidy/backends/local/__init__.py
	mopidy/backends/spotify/__init__.py
	mopidy/utils/__init__.py
	mopidy/utils/network.py
	tests/version_test.py

docs/changes.rst

@@ -8,10 +8,6 @@ This change log is used to track all major changes to Mopidy.
 v0.9.0 (in development)
 =======================
 
-**Dependencies**
-
-- Pykka >= 1.0 is now required.
-
 **Multiple backends support**
 
 Support for using the local and Spotify backends simultaneously have for a very
@@ -72,6 +68,17 @@ backends:
 
 - The Spotify backend now includes release year and artist on albums.
 
+
+v0.8.1 (2012-10-30)
+===================
+
+A small maintenance release to fix a bug introduced in 0.8.0 and update Mopidy
+to work with Pykka 1.0.
+
+**Dependencies**
+
+- Pykka >= 1.0 is now required.
+
 **Bug fixes**
 
 - :issue:`213`: Fix "streaming task paused, reason not-negotiated" errors

mopidy/__init__.py

@@ -21,7 +21,7 @@ if (isinstance(pykka.__version__, basestring)
 warnings.filterwarnings('ignore', 'could not open display')
 
 
-__version__ = '0.8.0'
+__version__ = '0.8.1'
 
 
 from mopidy import settings as default_settings_module

tests/version_test.py

@@ -27,5 +27,6 @@ class VersionTest(unittest.TestCase):
         self.assertLess(SV('0.7.0'), SV('0.7.1'))
         self.assertLess(SV('0.7.1'), SV('0.7.2'))
         self.assertLess(SV('0.7.2'), SV('0.7.3'))
-        self.assertLess(SV('0.7.3'), SV(__version__))
-        self.assertLess(SV(__version__), SV('0.8.1'))
+        self.assertLess(SV('0.7.3'), SV('0.8.0'))
+        self.assertLess(SV('0.8.0'), SV(__version__))
+        self.assertLess(SV(__version__), SV('0.8.2'))