Merge branch 'master' into flattr
commit7dc35a8c1d20e456ac9bcb15f0f2d9a8358a6158
authorStefan Kögl <stefan@skoegl.net>
Sun, 30 Dec 2012 20:03:06 +0000 (30 21:03 +0100)
committerStefan Kögl <stefan@skoegl.net>
Sun, 30 Dec 2012 20:03:06 +0000 (30 21:03 +0100)
tree23dfe3546a4d3266eb221300304ab3cfabb5af86
parent13af64dd6dab888084ae88d734a84c67dfce39b0
parent46858b25dc7b419eb8bb238138a02cbdc0179310
Merge branch 'master' into flattr
mygpo/web/views/episode.py
mygpo/web/views/podcast.py
requirements.txt