Merge branch 'master' into redalert

This commit is contained in:
Joseph Schorr 2014-07-18 15:58:56 -04:00
commit 591cd020b8
15 changed files with 153 additions and 184 deletions

View file

@ -3,7 +3,6 @@ import logging.config
logging.config.fileConfig('conf/logging.conf', disable_existing_loggers=False)
import logging
import daemon
import argparse
import os
import requests