Merge branch 'master' of github.com:FinalsClub/karmaworld
authorCharles Holbrow <charlesholbrow@gmail.com>
Mon, 11 Feb 2013 22:11:12 +0000 (17:11 -0500)
committerCharles Holbrow <charlesholbrow@gmail.com>
Mon, 11 Feb 2013 22:11:12 +0000 (17:11 -0500)
commit1425b69aeded4feabb4a4f9980ed2a218591b269
treec8643ecb6ae5468396bc0ce970bca5069f23a83a
parent02a6252c2ae7d8a05515cce6ba704db509709276
parent717df8b9837913771f2a94367a8958c839ef71b6
Merge branch 'master' of github.com:FinalsClub/karmaworld

Conflicts:
karmaworld/templates/courses/course_list.html
karmaworld/assets/js/sort-tables.js