Merge branch 'master' into redesign
authorCharles Connell <charles@connells.org>
Mon, 24 Mar 2014 19:42:28 +0000 (15:42 -0400)
committerCharles Connell <charles@connells.org>
Mon, 24 Mar 2014 19:43:41 +0000 (15:43 -0400)
commitfb1de1e18ed83d2894ca5f04c0134e0244632160
tree984ea0f3ec626ead20f05a34e6e0896fd86690f5
parentdc8cfd6cade31aa4f09874ae658d3d1161736a3e
parent9aef53ab06aca48694d634d1f75f57c8e3989cd3
Merge branch 'master' into redesign

Conflicts:
karmaworld/templates/courses/course_list.html
karmaworld/templates/courses/course_list_entry.html
karmaworld/templates/courses/course_list.html