From: Charles Connell <charles@connells.org>
Date: Wed, 5 Feb 2014 22:37:48 +0000 (-0500)
Subject: Merge branch 'master' into quizzes
X-Git-Tag: release-20150131~148^2^2~22
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d3bf9fe36b545cae55baa0d7eb9f9785fd378e7d;p=oweals%2Fkarmaworld.git

Merge branch 'master' into quizzes

Conflicts:
	reqs/common.txt
---

d3bf9fe36b545cae55baa0d7eb9f9785fd378e7d
diff --cc reqs/common.txt
index bf16cd2,08ec9c8..0dd59c4
--- a/reqs/common.txt
+++ b/reqs/common.txt
@@@ -21,4 -21,4 +21,5 @@@ html2tex
  django-allauth
  boto==2.6.0
  django-storages==1.1.4
 +git+https://github.com/Soaa-/django-nested-inlines.git
+ django-reversion