Merge remote-tracking branch 'upstream/4.5' into 4.5-4.6-2015-03-16-17-24-33

author kurund <kurund@civicrm.org>

Mon, 16 Mar 2015 11:54:51 +0000 (17:24 +0530)

committer kurund <kurund@civicrm.org>

Mon, 16 Mar 2015 11:54:51 +0000 (17:24 +0530)
author kurund <kurund@civicrm.org>
Mon, 16 Mar 2015 11:54:51 +0000 (17:24 +0530)
committer kurund <kurund@civicrm.org>
Mon, 16 Mar 2015 11:54:51 +0000 (17:24 +0530)
diff --cc CRM/Contact/BAO/ContactType.php
Simple merge
diff --cc CRM/Core/BAO/CustomField.php
Simple merge
diff --cc CRM/Upgrade/Incremental/php/FourFive.php

index e6dc42914239f77b2e0eeade4f8dadc1d4a12184,46a36a30fca566f27e3fc243b6e45912f965ae33..86932594b5197ebeebaaa54f700fe53461fc5c1e

mode 100644,100755..100755
--- 1/CRM/Upgrade/Incremental/php/FourFive.php
--- 2/CRM/Upgrade/Incremental/php/FourFive.php
+++ b/CRM/Upgrade/Incremental/php/FourFive.php
author	kurund <kurund@civicrm.org>
	Mon, 16 Mar 2015 11:54:51 +0000 (17:24 +0530)
committer	kurund <kurund@civicrm.org>
	Mon, 16 Mar 2015 11:54:51 +0000 (17:24 +0530)
		1	2
CRM/Contact/BAO/ContactType.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Core/BAO/CustomField.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Upgrade/Incremental/php/FourFive.php	patch \|	diff1 \|	diff2 \|	blob \| history