Public Git Hosting - mygpo.git/commit

commit	281b42cc53f8f5aa42089e0c16a4cec654010f80
author	Stefan Kögl <stefan@skoegl.net>
	Sat, 28 Sep 2013 16:16:46 +0000 (28 18:16 +0200)
committer	Stefan Kögl <stefan@skoegl.net>
	Sat, 28 Sep 2013 16:16:46 +0000 (28 18:16 +0200)
tree	a4e8294419fa4540af9d938fa99dfb802216f0ef	tree \| snapshot (tar.gz zip)
parent	b618b0ed35bc4970c460b5a61d295b16fe83c79e	commit \| diff

fix reloading podcasts on update conflict

gpodder.net is a webservice that connects podcast players

mygpo/data/feeddownloader.py		diff \| blob \| blame \| history
mygpo/data/management/commands/tag-downloader.py		diff \| blob \| blame \| history
mygpo/db/couchdb/podcast.py		diff \| blob \| blame \| history
mygpo/maintenance/management/commands/move-subscriber-data.py		diff \| blob \| blame \| history
mygpo/maintenance/merge.py		diff \| blob \| blame \| history