edx/edx-ora2 — pull request #265 by wedaly (2014-04-07 23:40:27+00:00)
Title: Fix tests that broke during text updates

@stephensanchez Accidentally merged a PR after rebasing without letting the test suite finish running. This fixes the broken tests in master.