daniel oeh 02926a6e5f Merge branch 'gpoddernet' into develop
Conflicts:
	AndroidManifest.xml
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/preferences.xml
	src/de/danoeh/antennapod/activity/PreferenceActivity.java
2013-09-05 15:24:50 +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