Vik Paruchuri 5a51d142bb Merge remote-tracking branch 'origin/master' into feature/vik/oe-versioning ...

Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py

2013-02-06 15:26:01 -05:00

..

djangoapps

Pep8 autofixes

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

lib

Merge remote-tracking branch 'origin/master' into feature/vik/oe-versioning

2013-02-06 15:26:01 -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