Brian Wilson aa172272f3 Update master with hotfixes from release-2013-10-17.

2013-10-18 11:50:42 -04:00

..

test_files

Integrate js-test-tool into testing infrastructure

2013-08-26 20:21:18 -04:00

xmodule

Update master with hotfixes from release-2013-10-17.

2013-10-18 11:50:42 -04:00

.coveragerc

perform a new merge from master, resolve conflicts

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

setup.py

Update XBlock requirement to new XML code.

2013-09-30 21:09:43 -04:00