Merge branch 'master' into feature_course_add_with_dept 358/head
authorCharles Connell <charles@connells.org>
Mon, 17 Mar 2014 16:55:15 +0000 (12:55 -0400)
committerCharles Connell <charles@connells.org>
Mon, 17 Mar 2014 16:55:15 +0000 (12:55 -0400)
commit9a2b50052ced7dc5c02bc9fd7a10da19b8846814
tree91a2cb25bc44f7dd14ab999f275e0745df158026
parente365d0dad6dcbbbd1ac44d1b37fd408463d55495
parentf69e48e4e564a291f8fe19db7f4c6a41afe07998
Merge branch 'master' into feature_course_add_with_dept

Conflicts:
reqs/common.txt
karmaworld/assets/css/global.css
karmaworld/settings/common.py
karmaworld/urls.py
reqs/common.txt