Ned Batchelder c8a7b259ff Resolve conflicts merging master to rc/2013-11-21

2013-11-27 11:55:44 -05:00

..

test_files

Integrate js-test-tool into testing infrastructure

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

xmodule

Resolve conflicts merging master to rc/2013-11-21

2013-11-27 11:55:44 -05:00

.coveragerc

perform a new merge from master, resolve conflicts

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

setup.py

Resolve conflicts merging master to rc/2013-11-21

2013-11-27 11:55:44 -05:00