Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-06-08-21-41-06
authorkurund <kurund@civicrm.org>
Mon, 8 Jun 2015 16:16:08 +0000 (21:46 +0530)
committerkurund <kurund@civicrm.org>
Mon, 8 Jun 2015 16:16:08 +0000 (21:46 +0530)
commit5b141f201eeccd319743cc64b5d8154897ec13ea
tree9a4596d32442816bfa7aac28884e7a8951b9fa18
parent1f5308bd60a321bdc7da47fbfbf8e89575a8564a
parent8c481fb4ca80178a866071188969d6e639b202a9
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-06-08-21-41-06

Conflicts:
templates/CRM/Case/Form/CaseView.tpl
12 files changed:
CRM/Contribute/BAO/Query.php
CRM/Contribute/Form/Contribution.php
CRM/Contribute/Form/Task/SearchTaskHookSample.php
CRM/Core/Form/Search.php
CRM/Export/BAO/Export.php
CRM/Import/DataSource/CSV.php
CRM/Price/BAO/PriceSet.php
CRM/Report/Form/Contribute/Summary.php
CRM/Upgrade/Incremental/php/FourOne.php
CRM/Upgrade/Incremental/php/ThreeThree.php
templates/CRM/Case/Form/CaseView.tpl
templates/CRM/Contribute/Form/Contribution.tpl