From: Charles Connell <charles@connells.org>
Date: Sun, 9 Feb 2014 21:31:36 +0000 (-0500)
Subject: Merge branch 'master' into quizzes
X-Git-Tag: release-20150131~148^2^2~19
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6cddd5cdeb15d7643bd42a87556455d435a55039;p=oweals%2Fkarmaworld.git

Merge branch 'master' into quizzes

Conflicts:
	karmaworld/settings/dev.py
---

6cddd5cdeb15d7643bd42a87556455d435a55039