Merge branch '4.6' of https://github.com/civicrm/civicrm-core

author Eileen McNaughton <eileen@fuzion.co.nz>

Tue, 23 Jun 2015 11:10:42 +0000 (23:10 +1200)

committer Eileen McNaughton <eileen@fuzion.co.nz>

Tue, 23 Jun 2015 11:10:42 +0000 (23:10 +1200)
author Eileen McNaughton <eileen@fuzion.co.nz>
Tue, 23 Jun 2015 11:10:42 +0000 (23:10 +1200)
committer Eileen McNaughton <eileen@fuzion.co.nz>
Tue, 23 Jun 2015 11:10:42 +0000 (23:10 +1200)
diff --cc CRM/Contribute/BAO/Query.php
Simple merge
diff --cc CRM/Contribute/Form/Search.php
Simple merge
diff --cc CRM/Core/Controller.php
Simple merge
diff --cc xml/templates/civicrm_data.tpl
Simple merge
author	Eileen McNaughton <eileen@fuzion.co.nz>
	Tue, 23 Jun 2015 11:10:42 +0000 (23:10 +1200)
committer	Eileen McNaughton <eileen@fuzion.co.nz>
	Tue, 23 Jun 2015 11:10:42 +0000 (23:10 +1200)
		1	2
CRM/Contribute/BAO/Query.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/Form/Search.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Core/Controller.php	patch \|	diff1 \|	diff2 \|	blob \| history
xml/templates/civicrm_data.tpl	patch \|	diff1 \|	diff2 \|	blob \| history