Stein Magnus Jodal 18854c6f3b Merge branch 'develop' into feature/mpris-frontend ... Conflicts: data/mopidy.desktop		2011-01-11 22:11:56 +01:00
..
mopidy.desktop	Merge branch 'develop' into feature/mpris-frontend	2011-01-11 22:11:56 +01:00