Thomas Adamcik 702befd6ae Merge branch 'develop' into feature/extension-registry ... Conflicts: setup.py		2013-12-31 15:34:02 +01:00
..
http.rst	http: Move mopidy.{frontends => }.http	2013-12-31 14:04:25 +01:00
index.rst	docs: Fix link to Mopidy-Arcam	2013-10-23 21:20:00 +02:00
local.rst	local: Review comments and library interface update.	2013-12-31 14:57:54 +01:00
mpd.rst	mpd: Move mopidy.{frontends => }.mpd	2013-12-31 14:11:16 +01:00
stream.rst	docs: Add stream/timeout config value to docs	2013-12-05 23:03:50 +01:00