James Falcon b48c3807fd Merge branch 'playback-speed' into speed
Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	src/de/danoeh/antennapod/activity/PreferenceActivity.java
	src/de/danoeh/antennapod/service/PlaybackService.java
2013-05-06 21:48:18 -05:00
..
2013-04-09 12:21:49 +02:00
2013-03-07 20:02:23 +01:00