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)
commit370b4257c75e89eb18d4d926c11c293f5ab43f4f
treebb222e21ae6c1e1c68b7ca6ab7947b4366b7f4a7
parenta2e756717c28974dccb9d58a575e3a99d6c40543
parent246e7293ba9fdc9584a7c6e701b642f0053198c2
Merge pull request #3417 from eileenmcnaughton/test_fixes

CRM-14178 fix error static vs nonstatic error introded in PR process