David Baumgold 69bc10235e Merge remote-tracking branch 'remotes/origin/release' into release-2015-10-01-resolve-merge-conflicts

2015-10-01 15:28:55 -04:00

..

test_files

…

xmodule

Merge remote-tracking branch 'remotes/origin/release' into release-2015-10-01-resolve-merge-conflicts

2015-10-01 15:28:55 -04:00

setup.py

Upgrade setuptools to 18.0.1

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