From: kurund <kurund@civicrm.org>
Date: Mon, 29 Jun 2015 17:55:19 +0000 (+0530)
Subject: Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-06-29-23-22-39
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0bc483648ce59a68bb752827b218f6976689660e;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-06-29-23-22-39

Conflicts:
	CRM/Contribute/Form/Search.php
	CRM/Core/Lock.php
---

0bc483648ce59a68bb752827b218f6976689660e
diff --cc CRM/Contribute/Form/Search.php
index 21d9a62046,9e224d1e59..bd5d539443
--- a/CRM/Contribute/Form/Search.php
+++ b/CRM/Contribute/Form/Search.php
@@@ -263,8 -263,7 +263,9 @@@ class CRM_Contribute_Form_Search extend
          'contribution_status_id',
          'contribution_source',
          'contribution_trxn_id',
 +        'contribution_page_id',
 +        'contribution_product_id',
+         'invoice_id',
        );
        foreach ($specialParams as $element) {
          $value = CRM_Utils_Array::value($element, $this->_formValues);