Vik Paruchuri 7871fce7ff Merge branch 'feature/vik/fix-oe-storage' into feature/vik/storage-model-fixes ...

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

2013-03-06 12:49:11 -05:00

..

djangoapps

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-04 16:33:40 -05:00

lib

Merge branch 'feature/vik/fix-oe-storage' into feature/vik/storage-model-fixes

2013-03-06 12:49:11 -05:00

static

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-06 12:15:07 -05:00

templates

Merged, delete Ace.

2013-02-19 14:56:37 -05:00

test

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-04 16:33:40 -05:00

xml_cleanup.py

Pep8 autofixes

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