Merge pull request #2817 from colemanw/custom
authorcolemanw <coleman@civicrm.org>
Thu, 3 Apr 2014 23:16:04 +0000 (19:16 -0400)
committercolemanw <coleman@civicrm.org>
Thu, 3 Apr 2014 23:16:04 +0000 (19:16 -0400)
HR-322 - Ensure customFieldOptions hook is always called for custom fields


Trivial merge