Ruud 892ee283ef Merge branch 'master' of github.com:CouchPotato/CouchPotato ...

Conflicts:
	couchpotato/core/plugins/searcher/__init__.py

2011-08-19 16:15:51 +02:00

..

__init__.py

Renamer, movie searcher, Library scanning

2011-05-28 20:52:18 +02:00

main.py

Merge branch 'master' of github.com:CouchPotato/CouchPotato

2011-08-19 16:15:51 +02:00