Tom Hennen 236757e803 Merge branch 'master' into merge_1.1.2 ... resolves AntennaPod/AntennaPod#805		2015-05-10 13:33:33 -04:00
..
src	Merge branch 'master' into merge_1.1.2	2015-05-10 13:33:33 -04:00
.gitignore	Moved core classes into subproject	2014-10-11 17:43:07 +02:00
build.gradle	Another fix...	2015-04-12 01:40:09 +02:00
proguard-rules.pro	Moved core classes into subproject	2014-10-11 17:43:07 +02:00