Merge branch 'master' into 208-edit-course-properties-main
authorJacob Hilker <hilker.j@gmail.com>
Sat, 1 Feb 2014 21:55:08 +0000 (16:55 -0500)
committerJacob Hilker <hilker.j@gmail.com>
Sat, 1 Feb 2014 21:55:08 +0000 (16:55 -0500)
Conflicts:
karmaworld/apps/courses/views.py

1  2 
karmaworld/apps/courses/views.py

Simple merge