Merge pull request #2270 from eileenmcnaughton/test-fixes
authorcolemanw <coleman@civicrm.org>
Fri, 3 Jan 2014 05:54:21 +0000 (21:54 -0800)
committercolemanw <coleman@civicrm.org>
Fri, 3 Jan 2014 05:54:21 +0000 (21:54 -0800)
Test fixes


Trivial merge