Merge branch 'master' into quizzes
authorCharles Connell <charles@connells.org>
Sun, 9 Feb 2014 21:31:36 +0000 (16:31 -0500)
committerCharles Connell <charles@connells.org>
Sun, 9 Feb 2014 21:31:36 +0000 (16:31 -0500)
commit6cddd5cdeb15d7643bd42a87556455d435a55039
treeb5b278512c64937da23ce4b77393a4a9ad33a318
parente6b17e8f9283f4e8973d6358d519f6f147d8cca7
parent5a21c16bd646815c42dc0aae61b53d3b996aace6
Merge branch 'master' into quizzes

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