Merge branch 'master' into quizzes
authorCharles Connell <charles@connells.org>
Tue, 25 Feb 2014 22:19:46 +0000 (17:19 -0500)
committerCharles Connell <charles@connells.org>
Tue, 25 Feb 2014 22:19:46 +0000 (17:19 -0500)
commit6b5bfeac76b354bee2c85d12fcaa27f8de5316e6
treef8d934e679aa9a0b80099e2ce18ae8b7005bb1b1
parent22295f4a2cc181929df92c88102f2a39fcd12dab
parent47c7e496adb63450e3f7372d82d9b7751020b4d1
Merge branch 'master' into quizzes
karmaworld/settings/common.py