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

..

_core

Hope this fixes the crappy merge...

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

clientscript

Better variable naming

2011-12-16 22:34:33 +01:00

desktop

Hope this fixes the crappy merge...

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

scheduler

More logging stuff

2012-01-06 21:24:04 +01:00

__init__.py

Scheduler

2011-04-17 23:36:23 +02:00