Merge pull request #8173 from eileenmcnaughton/master
authorcolemanw <coleman@civicrm.org>
Sat, 14 May 2016 17:58:42 +0000 (13:58 -0400)
committercolemanw <coleman@civicrm.org>
Sat, 14 May 2016 17:58:42 +0000 (13:58 -0400)
Fix for test suite leakage issue, ornery test


Trivial merge