Merge master into develop

This commit is contained in:
Stein Magnus Jodal 2013-12-30 19:40:24 +01:00
commit b367d032f1

View File

@ -40,3 +40,7 @@ To get started with Mopidy, check out `the docs <http://docs.mopidy.com/>`_.
.. image:: https://coveralls.io/repos/mopidy/mopidy/badge.png?branch=develop
:target: https://coveralls.io/r/mopidy/mopidy?branch=develop
:alt: Test coverage
.. image:: https://sourcegraph.com/api/repos/github.com/mopidy/mopidy/counters/views-24h.png
:target: https://sourcegraph.com/github.com/mopidy/mopidy
:alt: Mopidy stats