Merge remote-tracking branch 'octe/develop' into develop

Browse Source

Conflicts:
	mopidy/frontends/mpd/translator.py

...

This commit is contained in:

Stein Magnus Jodal 2011-04-05 21:45:06 +02:00

parent dec1643e7f 5dc6a17d20

commit bd6357fa45

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available