Adam Palay 67890b3c66 resolve merge conflict with hotfix branch

2013-09-03 16:00:24 -04:00

..

test_files

Integrate js-test-tool into testing infrastructure

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

xmodule

resolve merge conflict with hotfix branch

2013-09-03 16:00:24 -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