David Ormsbee 156dc1fb6c Merge branch 'master' into feature/victor/actual-askbot-removal ...

Conflicts:
	lms/envs/aws.py

2012-11-15 14:24:55 -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/victor/actual-askbot-removal

2012-11-15 14:24:55 -05:00

.coveragerc

Make coverage reports only include code from the source directories

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

setup.py

bugfix to self assessment

2012-10-30 20:36:45 -04:00