Merge pull request #3444 from davecivicrm/CRM-14801
authorDave Greenberg <dave@civicrm.org>
Thu, 5 Jun 2014 21:36:50 +0000 (14:36 -0700)
committerDave Greenberg <dave@civicrm.org>
Thu, 5 Jun 2014 21:36:50 +0000 (14:36 -0700)
CRM-14801 - fix notices and fix code so option_values for Address Provid...


Trivial merge