Merge branch 'master' into develop

Conflicts:
	docs/changes.rst
	mopidy/__init__.py
	tests/version_test.py

docs/changes.rst

@@ -4,6 +4,7 @@ Changes
 
 This change log is used to track all major changes to Mopidy.
 
+
 v0.8 (in development)
 =====================
 
@@ -17,6 +18,17 @@ v0.8 (in development)
   version string at :attr:`mopidy.__version__` to conform to :pep:`396`.
 
 
+v0.7.1 (2012-04-22)
+===================
+
+This is a maintenance release to make Mopidy 0.6 work with pyspotify >= 1.7.
+
+**Changes**
+
+- Don't override pyspotify's ``notify_main_thread`` callback. The default
+  implementation is sensible, while our override did nothing.
+
+
 v0.7.0 (2012-02-25)
 ===================
 

mopidy/backends/spotify/session_manager.py

@@ -96,10 +96,6 @@ class SpotifySessionManager(BaseThread, PyspotifySessionManager):
         """Callback used by pyspotify"""
         logger.debug(u'User message: %s', message.strip())
 
-    def notify_main_thread(self, session):
-        """Callback used by pyspotify"""
-        logger.debug(u'notify_main_thread() called')
-
     def music_delivery(self, session, frames, frame_size, num_frames,
             sample_type, sample_rate, channels):
         """Callback used by pyspotify"""

tests/version_test.py

@@ -25,7 +25,8 @@ class VersionTest(unittest.TestCase):
         self.assert_(SV('0.5.0') < SV('0.6.0'))
         self.assert_(SV('0.6.0') < SV('0.6.1'))
         self.assert_(SV('0.6.1') < SV('0.7.0'))
-        self.assert_(SV('0.7.0') < SV(__version__))
+        self.assert_(SV('0.7.0') < SV('0.7.1'))
+        self.assert_(SV('0.7.1') < SV(__version__))
         self.assert_(SV(__version__) < SV('0.8.1'))
 
     def test_get_platform_contains_platform(self):