Ruud 33602f227d Hope this fixes the crappy merge... ...

Conflicts:

	couchpotato/core/_base/_core/main.py
	couchpotato/core/_base/desktop/main.py

2012-01-14 12:12:54 +01:00

..

__init__.py

Plugin to send data to desktop CP

2012-01-07 22:58:26 +01:00

main.py

Hope this fixes the crappy merge...

2012-01-14 12:12:54 +01:00