Adam Palay 76fc180cd9 Merge remote-tracking branch 'origin/release' into merge-release-into-master ...

Conflicts:
	common/lib/xmodule/xmodule/css/capa/display.scss

2015-09-01 16:01:04 -04:00

..

capa

Merge remote-tracking branch 'origin/release' into merge-release-into-master

2015-09-01 16:01:04 -04:00

setup.py

Upgrade setuptools to 18.0.1

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