Merge branch 'master' into py3
commit5a580a51d70af32b03ee73123eaabbe182a3c011
authorStefan Kögl <stefan@skoegl.net>
Thu, 4 Jun 2015 10:31:11 +0000 (4 12:31 +0200)
committerStefan Kögl <stefan@skoegl.net>
Thu, 4 Jun 2015 10:31:11 +0000 (4 12:31 +0200)
treed74cae6d10ab785c801ca78e02a407a9d8ba11d6
parented1a1b40230beed880533d0c4f881429c4a78bc1
parent3e1f2dc7a60dee7d0178a807daf2540a4237ee23
Merge branch 'master' into py3
mygpo/data/feeddownloader.py