edx/edx-platform — pull request #3758 by clytwynec (2014-05-16 15:19:12+00:00)
Title: disabled test_lms.py:XBlockAcidNoChildTest.test_acid_block

@jzoldak please review