Rocky Duan 0b3e9909a4 Merge branch 'master' into refactor ...

Conflicts:
	lms/djangoapps/django_comment_client/tests.py
	lms/static/coffee/src/discussion/content.coffee
	requirements.txt

2012-08-20 15:35:31 -07: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 refactor

2012-08-20 15:35:31 -07:00

setup.py

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

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