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)
commitbcc06a7a5894b2ff431378f3eefd2bea034b10f6
treef1abf8529d0f3cbed735eeb0ee6915fc92d20e77
parent345249550f38bfdfe40ffbfb1a942e9712ff4559
parentfe48a318e8c4fe495710e3c648118770394a8fc9
Merge branch 'master' into 208-edit-course-properties-main

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