Victor Shnayder 6847779f22 Merge remote-tracking branch 'origin/master' into feature/victor/cohorts ...

Conflicts:
	common/djangoapps/student/models.py

2013-01-26 12:37:26 -05:00

..

capa

Refactoring and cleaning of code.

2013-01-21 15:56:39 +02:00

course_groups

add conflict detection--users should be in at most one cohort per course

2013-01-24 15:14:34 -05:00

vendor

Updated comment

2013-01-25 13:03:54 -05:00