edx/XBlock — pull request #255 by cahrens (2014-11-05 22:13:38+00:00)
Title: Back out PR 240 until edx-platform test failures can be resolved

Related to https://github.com/edx/edx-platform/pull/5825