Chris Dodge 22695d80c7 Merge branch 'master' into feature/cdodge/cms-master-merge4 ...

Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt

2013-01-17 09:15:37 -05:00

..

capa

Merge branch 'master' into feature/cdodge/cms-master-merge4

2013-01-17 09:15:37 -05:00

.coveragerc

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

setup.py

add pyparsing to requirements for capa lib

2012-07-10 14:12:32 -04:00