Public Git Hosting - mygpo.git/commit

commit	cdd4406f71216d82849b38d489f0989f3f48a6bf
author	Stefan Kögl <stefan@skoegl.net>
	Sat, 22 Dec 2012 15:42:02 +0000 (22 16:42 +0100)
committer	Stefan Kögl <stefan@skoegl.net>
	Sat, 22 Dec 2012 15:42:02 +0000 (22 16:42 +0100)
tree	41aae73d512a7ab30a5cba1c03cb2cb8a7513c70	tree \| snapshot (tar.gz zip)
parent	8f47b59ab1e382b3db9430287d6f91958ffc9485	commit \| diff
parent	802d83d655cef0d982c5c87d08f82959ee079988	commit \| diff

Merge branch 'master' into flattr

gpodder.net is a webservice that connects podcast players

mygpo/api/advanced/__init__.py	diff1 \|	diff2 \|	blob \| history
mygpo/data/feeddownloader.py	diff1 \|	diff2 \|	blob \| history
mygpo/db/couchdb/episode_state.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/templates/episode.html	diff1 \|	diff2 \|	blob \| history
mygpo/web/templates/podcast.html	diff1 \|	diff2 \|	blob \| history
mygpo/web/views/__init__.py	diff1 \|	diff2 \|	blob \| history
requirements.txt	diff1 \|	diff2 \|	blob \| history