Ruud 3e035f84b1 Merge branch 'refs/heads/develop' into tv ...

Conflicts:
	couchpotato/core/helpers/variable.py
	couchpotato/core/media/_base/searcher/main.py
	couchpotato/core/media/movie/searcher/main.py
	couchpotato/core/plugins/quality/main.py
	couchpotato/core/plugins/release/main.py
	couchpotato/core/plugins/renamer/main.py

2013-11-24 23:13:25 +01:00

..

__init__.py

Link to country codes for subtitles

2013-03-25 12:24:54 +01:00

main.py

Merge branch 'refs/heads/develop' into tv

2013-11-24 23:13:25 +01:00