Don Mitchell a9233dfd44 Merge branch 'course-info' into feature/dhm/cms-settings ...

Conflicts:
	cms/djangoapps/contentstore/views.py

2012-11-19 16:00:27 -05:00

..

auth

allow importing of .tar.gz packages of courseware

2012-10-12 10:33:31 -04:00

contentstore

Merge branch 'course-info' into feature/dhm/cms-settings

2012-11-19 16:00:27 -05:00