Merge branch '2.1.2' into 2.1.x

Conflicts: python_apps/pypo/pypofetch.py
2012-06-18 14:57:22 -04:00 · 2012-06-18 14:57:22 -04:00 · 27a6326c58
commit 27a6326c58
parent 24cf9600e2 c8559cc88c
10 changed files with 53 additions and 4 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 = {}