daniel oeh 8337739ab4 Merge branch 'playback-speed' of git://github.com/TheRealFalcon/AntennaPod into playback-speed-tmp
Conflicts:
	src/de/danoeh/antennapod/activity/AudioplayerActivity.java
	src/de/danoeh/antennapod/activity/PreferenceActivity.java
	src/de/danoeh/antennapod/service/PlaybackService.java
	src/de/danoeh/antennapod/util/playback/PlaybackController.java
2013-08-16 21:22:35 +02:00
..
2012-12-23 11:10:51 +01:00
2013-08-14 17:22:13 +02:00
2013-02-23 13:28:31 +01:00