Ruud 2a2fe448e7 Merge branch 'refs/heads/develop' into tv ...

Conflicts:
	couchpotato/core/media/movie/_base/main.py
	couchpotato/core/providers/torrent/bitsoup/main.py
	couchpotato/core/providers/torrent/iptorrents/main.py
	couchpotato/core/providers/torrent/sceneaccess/main.py
	couchpotato/core/providers/torrent/torrentleech/main.py
	couchpotato/core/providers/torrent/torrentshack/main.py

2014-01-11 13:55:12 +01:00

..

__init__.py

Seperated release plugin

2011-06-04 21:39:41 +02:00

main.py

Merge branch 'refs/heads/develop' into tv

2014-01-11 13:55:12 +01:00