Merge branch '2.1.x' into devel

2012-06-19 17:57:27 -04:00 · 2012-06-19 17:57:27 -04:00 · f029124447
commit f029124447
parent f3d0f06397 9ac024fa72
13 changed files with 231 additions and 143 deletions
--- a/python_apps/pypo/pypofetch.py
+++ b/python_apps/pypo/pypofetch.py
@ -404,7 +404,7 @@ class PypoFetch(Thread):
     - runs the cleanup routine, to get rid of unused cached files
    """
    def process_schedule(self, schedule_data):      
-	self.last_update_schedule_timestamp = time.time()
+        self.last_update_schedule_timestamp = time.time()
        self.logger.debug(schedule_data)
        media = schedule_data["media"]
        media_filtered = {}