Merge branch 'crm-13089-CRM_Core_BAO_CustomField_overrides_name' of git://github...
authorTim Otten <totten@civicrm.org>
Fri, 9 Aug 2013 22:39:15 +0000 (15:39 -0700)
committerTim Otten <totten@civicrm.org>
Fri, 9 Aug 2013 22:39:15 +0000 (15:39 -0700)
1  2 
CRM/Core/BAO/CustomField.php

Simple merge