Calen Pennington 531eb80eb2 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged ...

Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	lms/djangoapps/open_ended_grading/tests.py

2013-03-13 12:18:04 -04:00

..

tests

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

2013-03-13 12:18:04 -04:00

__init__.py

Add a course_groups djangoapp with a CourseUserGroup model.

2013-01-24 15:12:52 -05:00

cohorts.py

Add logging to debug strange cohort behavior on prod.

2013-03-11 15:24:14 -07:00

models.py

Pep8 autofixes

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

views.py

Pep8 autofixes

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