lms · 596e1ead297c4b8185a763b802017570b615c6a0 · edx / edx-platform

Merge hotfix 2013-07093 into master · 06529054

Conflicts:
	common/lib/xmodule/xmodule/crowdsource_hinter.py
	common/lib/xmodule/xmodule/css/crowdsource_hinter/display.scss
	common/lib/xmodule/xmodule/js/src/crowdsource_hinter/display.coffee
	common/static/coffee/src/logger.coffee
	common/templates/hinter_display.html
	lms/envs/test.py
	lms/urls.py

committed Jul 03, 2013

06529054

Name	Last commit	Last update
..
djangoapps		Loading commit data...
envs		Loading commit data...
lib		Loading commit data...
static		Loading commit data...
templates		Loading commit data...
.coveragerc		Loading commit data...
__init__.py		Loading commit data...
one_time_startup.py		Loading commit data...
urls.py		Loading commit data...
wsgi.py		Loading commit data...
wsgi_apache_lms.py		Loading commit data...
xmodule_namespace.py		Loading commit data...