Merge branch 'master' of dgpo:mygpo-src
commit6b55985bd0625179db35e7ab0b2a060810879276
authorStefan Koegl <stefan@skoegl.net>
Fri, 8 Jan 2010 17:31:54 +0000 (8 18:31 +0100)
committerStefan Koegl <stefan@skoegl.net>
Fri, 8 Jan 2010 17:31:54 +0000 (8 18:31 +0100)
tree60124104a2acfc364d6448ee19a0c5787783cdbe
parentda3854c42faf33357db4f24740a7bf7fdfc2bdae
parentff73074ea81910d968c2f836fe8cbcf3f5bdd968
Merge branch 'master' of dgpo:mygpo-src
mygpo/urls.py
mygpo/web/templates/base.html
mygpo/web/templates/podcast.html
mygpo/web/views.py