Stanford-Online/edx-platform — pull request #67 by stvstnfrd (2014-07-08 21:05:45+00:00)
Title: Fix failing forked test

We had fixed this previously in #63, so I think we just took the wrong side of
a conflict when merging from upstream.