Merge pull request #6679 from kurund/test-fixes
authorKurund Jalmi <kurund@civicrm.org>
Fri, 4 Sep 2015 01:45:30 +0000 (18:45 -0700)
committerKurund Jalmi <kurund@civicrm.org>
Fri, 4 Sep 2015 01:45:30 +0000 (18:45 -0700)
test fixes


Trivial merge