From: Charles Connell <charles@connells.org>
Date: Mon, 14 Apr 2014 20:08:57 +0000 (-0400)
Subject: Merge branch 'feature_course_add_with_dept'
X-Git-Tag: release-20150131~143
X-Git-Url: https://git.librecmc.org/?p=oweals%2Fkarmaworld.git;a=commitdiff_plain;h=a3b1980a09a61488bc03c9d19161c04f9680a941

Merge branch 'feature_course_add_with_dept'
---

a3b1980a09a61488bc03c9d19161c04f9680a941