Merge branch 'master' into redesign
authorCharles Connell <charles@connells.org>
Tue, 8 Apr 2014 21:33:29 +0000 (17:33 -0400)
committerCharles Connell <charles@connells.org>
Tue, 8 Apr 2014 21:33:29 +0000 (17:33 -0400)
commit11535ba52648adcc57b28829b6bed3dab8bdca6e
tree1f378f5c1c2e854013545337fc5fe7fbaeeb3380
parent48ec225598863e0a7a910cb709ea8b41569b207f
parent8297e218be72c1b116242bdc0bf6796f8eb4e6c1
Merge branch 'master' into redesign

Conflicts:
karmaworld/assets/js/course-detail.js
karmaworld/templates/courses/course_list_entry.html
karmaworld/templates/notes/note_list_entry.html
karmaworld/templates/notes/search_results.html