Merge pull request #6979 from eileenmcnaughton/master
authorcolemanw <coleman@civicrm.org>
Wed, 21 Oct 2015 01:04:07 +0000 (21:04 -0400)
committercolemanw <coleman@civicrm.org>
Wed, 21 Oct 2015 01:04:07 +0000 (21:04 -0400)
commitd830db44b471ae1f953395d1e123936617ab7e2d
tree7a4af7b1ee6a20410eac0995fce68e93e5a72a55
parentb1b75beaba965c924258d452260304afb6aa15d8
parentd5f547f815c21e5e2b8a370af462252ee19912cd
Merge pull request #6979 from eileenmcnaughton/master

CRM-17352 fix strict error on non-static method …