edx/edx-platform — pull request #1296 by wedaly (2013-10-10 14:26:49+00:00)
Title: Make wait_for_requirejs more tolerant of errors

This should resolve the acceptance test failures in course-settings.feature on master.

@singingwolfboy @jzoldak