Diana Huang 6f147df7f7 Merge branch 'master' into feature/diana/close-oe-problems ...

Conflicts:
	common/lib/xmodule/xmodule/peer_grading_module.py

2013-02-06 14:16:18 -05:00

..

test_files

Merge remote-tracking branch 'origin/master' into dormsbee/multicourse

2012-07-05 16:22:50 -04:00

xmodule

Merge branch 'master' into feature/diana/close-oe-problems

2013-02-06 14:16:18 -05:00

.coveragerc

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

jasmine_test_runner.html.erb

Clean up some JS errors showing up in the xmodule jasmine tests

2013-01-30 09:31:20 -05:00

setup.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00