Stein Magnus Jodal 5f7988d974 Merge branch 'develop' into feature/multi-backend ... Conflicts: mopidy/backends/local/__init__.py mopidy/outputs/gstreamer.py tests/frontends/mpd/audio_output_test.py tests/frontends/mpd/command_list_test.py tests/frontends/mpd/connection_test.py tests/frontends/mpd/current_playlist_test.py tests/frontends/mpd/dispatcher_test.py tests/frontends/mpd/music_db_test.py tests/frontends/mpd/playback_test.py tests/frontends/mpd/reflection_test.py tests/frontends/mpd/regression_test.py tests/frontends/mpd/status_test.py tests/frontends/mpd/stickers_test.py tests/frontends/mpd/stored_playlists_test.py		2011-04-25 15:05:33 +02:00
..
mpd	Merge branch 'develop' into feature/multi-backend	2011-04-25 15:05:33 +02:00
__init__.py	Relocate MPD frontend to 'mopidy.frontends.mpd'	2010-08-09 21:17:36 +02:00