Rocky Duan 2fb02f1a73 Merge branch 'master' of github.com:MITx/mitx into merge ...

Conflicts:
	lms/urls.py

2012-08-07 16:58:14 -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' of github.com:MITx/mitx into merge

2012-08-07 16:58:14 -04:00

setup.py

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

2012-08-01 16:45:21 -04:00