daniel oeh 75b13431fe Merge branch 'develop' into feedmanager_removal
Conflicts:
	src/de/danoeh/antennapod/activity/PreferenceActivity.java
	src/de/danoeh/antennapod/feed/FeedManager.java
	src/de/danoeh/antennapod/service/PlaybackService.java
	src/de/danoeh/antennapod/service/download/DownloadService.java
	src/de/danoeh/antennapod/service/download/DownloadStatus.java
	src/de/danoeh/antennapod/service/download/HttpDownloader.java
	src/de/danoeh/antennapod/storage/DownloadRequester.java
	src/de/danoeh/antennapod/storage/PodDBAdapter.java
	src/de/danoeh/antennapod/util/playback/PlaybackController.java
2013-08-05 14:57:37 +02:00
..
2012-12-23 11:10:51 +01:00
2013-03-07 20:02:23 +01:00
2013-08-03 21:24:13 +02:00
2013-02-23 13:28:31 +01:00