edx/edx-platform — pull request #3139 by adampalay (2014-03-31 18:29:25+00:00)
Title: Adam/merge jsdraw hotfix to master

Hotfix branch with master merged into it so that we can be sure that it passes tests