edx/edx-platform — pull request #3031 by jzoldak (2014-03-22 13:19:13+00:00)
Title: Disable failing bok-choy test_acid_block_editor test

Will be fixed when TE-369 is addressed.