Merge remote-tracking branch 'upstream/4.5' into 4.5-4.6-2015-03-16-17-24-33
authorkurund <kurund@civicrm.org>
Mon, 16 Mar 2015 11:54:51 +0000 (17:24 +0530)
committerkurund <kurund@civicrm.org>
Mon, 16 Mar 2015 11:54:51 +0000 (17:24 +0530)
commit65742a3ed0f9444378e73bdab10469176f07ce49
tree6d802e384d4295a145d324762e230044f43bfead
parent4933fff21f1d2eb8184f428d2069ccc0ddfd0db8
parent2dce55263c22e839033c2253dbf4dbcac84d1740
Merge remote-tracking branch 'upstream/4.5' into 4.5-4.6-2015-03-16-17-24-33
CRM/Contact/BAO/ContactType.php
CRM/Core/BAO/CustomField.php
CRM/Upgrade/Incremental/php/FourFive.php