Merge branch 'master' into design19/head
commit1c3d98e7a1ae88746ca966777973c2553fb79926
authorStefan Kögl <stefan@skoegl.net>
Thu, 17 Oct 2013 19:25:07 +0000 (17 21:25 +0200)
committerStefan Kögl <stefan@skoegl.net>
Thu, 17 Oct 2013 19:25:07 +0000 (17 21:25 +0200)
treea01ef7956f2b2f04f7a17a8ec18ff59d0a87d93f
parent1fb8430effa3c74327acb7b3a13a6b72e243a626
parent304cbbef349b3eea4e949fbf25b5b00daeb2ff8f
Merge branch 'master' into design
mygpo/db/couchdb/episode.py
mygpo/db/couchdb/podcast.py
mygpo/settings.py
mygpo/web/views/podcast.py