Ruud efdf77ef6c Merge branch 'refs/heads/develop' into tv ...

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

2013-11-30 12:44:13 +01:00

..

__init__.py

Seperated release plugin

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

main.py

Merge branch 'refs/heads/develop' into tv

2013-11-30 12:44:13 +01:00