Merge branch '2.5.x' into 2.5.x-installer

Conflicts:
	airtime_mvc/public/index.php
This commit is contained in:
Albert Santoni 2015-06-16 10:37:06 -04:00
commit 8c9981a155
46 changed files with 5024 additions and 996 deletions

View file

@ -31,7 +31,7 @@ signal.signal(signal.SIGINT, keyboardInterruptHandler)
#need to wait for Python 2.7 for this..
#logging.captureWarnings(True)
POLL_INTERVAL = 1800
POLL_INTERVAL = 480
class PypoFetch(Thread):