Merge branch 'master' of https://github.com/meteozond/python-feedgen · shon/python-feedgen@7e63289 · GitHub

Commit

Merge branch 'master' of https://github.com/meteozond/python-feedgen

Browse files

Conflicts:
	feedgen/ext/podcast.py
	feedgen/ext/podcast_entry.py

Loading branch information

meteozond committed Aug 15, 2013

2 parents d9b19f8 + 0c26245 commit 7e63289