From: Jacob Hilker <hilker.j@gmail.com>
Date: Sat, 1 Feb 2014 21:55:08 +0000 (-0500)
Subject: Merge branch 'master' into 208-edit-course-properties-main
X-Git-Tag: release-20150131~178^2~12
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bcc06a7a5894b2ff431378f3eefd2bea034b10f6;p=oweals%2Fkarmaworld.git

Merge branch 'master' into 208-edit-course-properties-main

Conflicts:
	karmaworld/apps/courses/views.py
---

bcc06a7a5894b2ff431378f3eefd2bea034b10f6