Merge pull request #7453 from colemanw/CRM-17646
authorcolemanw <coleman@civicrm.org>
Sat, 26 Dec 2015 15:24:48 +0000 (10:24 -0500)
committercolemanw <coleman@civicrm.org>
Sat, 26 Dec 2015 15:24:48 +0000 (10:24 -0500)
CRM-17646 Add hook for modifying field option lists

1  2 
CRM/Contact/Import/Parser/Contact.php
CRM/Event/BAO/Query.php

Simple merge
Simple merge