From: kurund <kurund@civicrm.org>
Date: Mon, 16 Mar 2015 11:54:51 +0000 (+0530)
Subject: Merge remote-tracking branch 'upstream/4.5' into 4.5-4.6-2015-03-16-17-24-33
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=65742a3ed0f9444378e73bdab10469176f07ce49;p=civicrm-core.git

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

65742a3ed0f9444378e73bdab10469176f07ce49
diff --cc CRM/Upgrade/Incremental/php/FourFive.php
index e6dc429142,46a36a30fc..86932594b5
mode 100644,100755..100755
--- a/CRM/Upgrade/Incremental/php/FourFive.php
+++ b/CRM/Upgrade/Incremental/php/FourFive.php