Julian Arni 7fc6057700 Merge branch 'master' into jkarni/fix/descriptorsystemruntime ...

Conflicts:
	cms/djangoapps/contentstore/views/preview.py

2013-08-12 15:04:49 -04:00

..

test_files

Create a new response type for Numerical/Formula

2013-08-12 11:48:45 -04:00

xmodule

Merge branch 'master' into jkarni/fix/descriptorsystemruntime

2013-08-12 15:04:49 -04:00

.coveragerc

perform a new merge from master, resolve conflicts

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

setup.py

Python: videoalpha -> video.

2013-08-12 14:31:48 +03:00