Merge branch 'master' into 208-edit-course-properties-main
authorJacob Hilker <hilker.j@gmail.com>
Sun, 2 Feb 2014 20:20:33 +0000 (15:20 -0500)
committerJacob Hilker <hilker.j@gmail.com>
Sun, 2 Feb 2014 20:20:33 +0000 (15:20 -0500)
commit7a93a30dc4e1f6fb2ec1075a5ea61f87fcca73f7
tree75c0aac12a876161905790ff02a5de56960364be
parent3a6ed921a4d25f08487fc961d6b738e216cd546a
parentc208853d76ee2a8a106554db68be00c0bfee903a
Merge branch 'master' into 208-edit-course-properties-main

Conflicts:
karmaworld/templates/courses/course_detail.html
karmaworld/settings/common.py
karmaworld/templates/courses/course_detail.html