Merge master

2012-08-28 12:37:24 -04:00
parent 25ea8b2990 88baeee1fb
commit fb5501855c
47 changed files with 1086 additions and 363 deletions
--- a/common/lib/capa/capa/xqueue_interface.py
+++ b/common/lib/capa/capa/xqueue_interface.py
@@ -8,7 +8,7 @@ import requests


 log = logging.getLogger('mitx.' + __name__)
-
+dateformat = '%Y%m%d%H%M%S'

 def make_hashkey(seed):
    '''