Merge pull request #3417 from eileenmcnaughton/test_fixes
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 3 Jun 2014 13:51:43 +0000 (01:51 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Tue, 3 Jun 2014 13:51:43 +0000 (01:51 +1200)
CRM-14178 fix error static vs nonstatic error introded in PR process


Trivial merge