Calen Pennington 821cc59415 Merge master into release-2015-09-02, leaving conflicts

2015-09-03 16:36:56 -04:00

..

test_files

Integrate js-test-tool into testing infrastructure

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

xmodule

Merge master into release-2015-09-02, leaving conflicts

2015-09-03 16:36:56 -04:00

setup.py

Upgrade setuptools to 18.0.1

2015-07-30 16:22:42 -04:00