Chris Dodge 08adf9c0d5 Merge branch 'master' into feature/cdodge/cms-master-merge3 ...

Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/search.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	doc/development.md
	lms/envs/common.py

2013-01-11 14:04:46 -05:00

..

capa

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

2013-01-11 14:04:46 -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