daniel oeh b1911e5ff7 Merge branch 'playback-speed' into develop ...

Conflicts:
	proguard.cfg
	src/de/danoeh/antennapod/storage/DBTasks.java

2013-08-25 14:06:41 +02:00

..

de/danoeh/antennapod

Merge branch 'playback-speed' into develop

2013-08-25 14:06:41 +02:00

instrumentationTest/de/test/antennapod

Fixed problems with auto-cleanup

2013-08-21 15:23:47 +02:00