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

Conflicts:
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	common/lib/xmodule/xmodule/timeparse.py

2013-02-06 13:26:22 -05:00

..

djangoapps

Pep8 autofixes

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

lib

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

2013-02-06 13:26:22 -05:00

static

Pep8 autofixes

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

templates

Update jquery ui. Overrode draggable w/ an in place fix for scroll

2013-01-25 12:44:58 -05:00

test

Fix some issues with peer grading service

2013-02-05 13:37:55 -05:00

xml_cleanup.py

Pep8 autofixes

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