Commit Graph

1 Commits

Author SHA1 Message Date
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