Merge branch 'master' into quizzes
authorCharles Connell <charles@connells.org>
Wed, 5 Feb 2014 22:37:48 +0000 (17:37 -0500)
committerCharles Connell <charles@connells.org>
Wed, 5 Feb 2014 22:37:48 +0000 (17:37 -0500)
commitd3bf9fe36b545cae55baa0d7eb9f9785fd378e7d
tree13d6b0c1aab5ec3ce56fe6e21239e41363b8afe7
parent9a1690caebecf08d1398cb933d1f53856ca756bf
parent216a5b9367a0f782198ee2a110508927424e119a
Merge branch 'master' into quizzes

Conflicts:
reqs/common.txt
karmaworld/settings/common.py
karmaworld/urls.py
reqs/common.txt