Merge pull request #3301 from davecivicrm/CRM-14367
authorDave Greenberg <dave@civicrm.org>
Mon, 19 May 2014 23:36:20 +0000 (16:36 -0700)
committerDave Greenberg <dave@civicrm.org>
Mon, 19 May 2014 23:36:20 +0000 (16:36 -0700)
CRM-14367 - Fix fatal error due to 5.3 vs 5.4 php reqs, and tweak warnin...


Trivial merge