David Ormsbee eb96497cff Merge branch 'master' into feature/bk_forum_int ...

Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/courseware.html
	requirements.txt

2012-08-20 18:57:46 -04: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/bk_forum_int

2012-08-20 18:57:46 -04:00

setup.py

Merge branch 'master' of github.com:MITx/mitx into profile

2012-08-18 16:57:00 -07:00