Calen Pennington 171e932266 Merge branch 'master' into feature/cale/cms-master ...

Conflicts:
	rakefile

2012-11-08 12:28:40 -05:00

..

test_files

Merge remote-tracking branch 'origin/master' into dormsbee/multicourse

2012-07-05 16:22:50 -04:00

xmodule

Merge branch 'master' into feature/cale/cms-master

2012-11-08 12:28:40 -05:00

.coveragerc

Make coverage reports only include code from the source directories

2012-11-08 12:25:12 -05:00

setup.py

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info

2012-11-06 14:20:59 -05:00