Merge remote-tracking branch 'origin/master' into master
authorAndreas Oberritter <obi@opendreambox.org>
Tue, 25 Mar 2014 01:12:42 +0000 (02:12 +0100)
committerAndreas Oberritter <obi@opendreambox.org>
Tue, 25 Mar 2014 01:12:42 +0000 (02:12 +0100)
commit270322da6f400f139cbe8f520b2b250bacf81cb4
treed0a267bd3f6e966b92f05a061335ed7d910f5ff7
parent3b104a6035776d5eba6537b7d0853ecb0c73aebf
parenta34a6ee8ea3961f5b40febb46527f57c3230f6e3
Merge remote-tracking branch 'origin/master' into master
podcast/src/plugin.py