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

Movie add

2011-03-03 13:48:31 +01:00

encoding.py

Remove leading '//' from *NIX paths

2013-12-29 23:42:55 +01:00

request.py

Code cleanup

2013-09-02 21:59:06 +02:00

rss.py

Code cleanup

2013-09-02 21:59:06 +02:00

variable.py

Merge branch 'refs/heads/develop' into tv

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