daniel oeh f6c5251b98 Merge branch 'develop' into playback-speed ... Conflicts: pom.xml src/de/danoeh/antennapod/service/PlaybackService.java src/de/danoeh/antennapod/util/playback/PlaybackController.java		2013-08-16 20:15:48 +02:00
..
dslv@c5f07d473a	Updated android gradle plugin	2013-08-15 13:25:57 +02:00