Merge branch 'master' into quizzes
authorCharles Connell <charles@connells.org>
Mon, 24 Feb 2014 20:16:18 +0000 (15:16 -0500)
committerCharles Connell <charles@connells.org>
Mon, 24 Feb 2014 20:16:18 +0000 (15:16 -0500)
commitc1d13952d3170fe024f1525a0d2fb9a52896826a
tree4611fee4d31204c822a7e75f53cb9aa474ae2d29
parent3d217b85f8a09f31db43055b76b977d165010257
parent07e4e870a43c5c25bf7d64868aa67374ebf234b3
Merge branch 'master' into quizzes

Conflicts:
karmaworld/urls.py
karmaworld/settings/common.py
karmaworld/templates/notes/note_detail.html
karmaworld/urls.py