edx/edx-platform — pull request #2909 by gwprice (2014-03-11 20:45:05+00:00)
Title: Improve robustness of bok choy discussion tests

A test failed because an element disappeared between the evaluation of
the clauses of a conjunction, so rewrite to make the conjunction
unnecessary.

@jimabramson