Ruud 1b59fd9af0 Merge branch 'refs/heads/develop' into tv ...

Conflicts:
	couchpotato/core/media/_base/searcher/main.py
	couchpotato/core/plugins/renamer/main.py

2013-10-03 08:17:20 +02:00

..

__init__.py

Scanner, Downloaders, Providers

2011-05-18 12:37:22 +02:00

main.py

Merge branch 'refs/heads/develop' into tv

2013-10-03 08:17:20 +02:00