Merge branch 'master' into develop

Conflicts:
	docs/changes.rst
This commit is contained in:
Stein Magnus Jodal 2013-01-03 23:55:00 +01:00
commit 928034222a
3 changed files with 11 additions and 3 deletions

View File

@ -46,6 +46,13 @@ Current limitations:
yourself. See :issue:`303` for progress on this.
v0.11.1 (2012-12-24)
====================
Spotify search was broken in 0.11.0 for users of Python 2.6. This release fixes
it. If you're using Python 2.7, v0.11.0 and v0.11.1 should be equivalent.
v0.11.0 (2012-12-24)
====================

View File

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

View File

@ -33,5 +33,6 @@ class VersionTest(unittest.TestCase):
self.assertLess(SV('0.8.0'), SV('0.8.1'))
self.assertLess(SV('0.8.1'), SV('0.9.0'))
self.assertLess(SV('0.9.0'), SV('0.10.0'))
self.assertLess(SV('0.10.0'), SV(__version__))
self.assertLess(SV(__version__), SV('0.11.1'))
self.assertLess(SV('0.10.0'), SV('0.11.0'))
self.assertLess(SV('0.11.0'), SV(__version__))
self.assertLess(SV(__version__), SV('0.11.2'))