daniel oeh 8e16ad08c8 Merge branch 'feedmanager_removal' into develop
Conflicts:
	src/de/danoeh/antennapod/activity/DownloadLogActivity.java
	src/de/danoeh/antennapod/activity/FeedItemlistActivity.java
	src/de/danoeh/antennapod/activity/ItemviewActivity.java
	src/de/danoeh/antennapod/activity/MiroGuideChannelViewActivity.java
	src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java
	src/de/danoeh/antennapod/activity/PreferenceActivity.java
	src/de/danoeh/antennapod/fragment/EpisodesFragment.java
	src/de/danoeh/antennapod/fragment/FeedlistFragment.java
	src/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
	src/de/danoeh/antennapod/fragment/ItemlistFragment.java
2013-08-10 16:10:32 +02:00
..
2012-07-15 15:55:42 +02:00
2013-01-20 00:02:29 +01:00
2013-01-19 23:38:41 +01:00
2013-01-20 00:02:29 +01:00
2013-02-23 13:28:31 +01:00
2012-07-23 13:50:08 +02:00
2012-07-23 17:05:34 +02:00
2013-08-07 20:38:39 +02:00
2013-01-20 00:02:29 +01:00
2013-01-20 00:02:29 +01:00
2012-07-24 14:37:34 +02:00