Merge branch '4.6' of https://github.com/civicrm/civicrm-core
authorEileen McNaughton <eileen@fuzion.co.nz>
Tue, 23 Jun 2015 11:10:42 +0000 (23:10 +1200)
committerEileen McNaughton <eileen@fuzion.co.nz>
Tue, 23 Jun 2015 11:10:42 +0000 (23:10 +1200)
commitec9a32fcbd1d4614a079798918d0a55ec74ef352
tree4f50d94a7164defff8c03d989becf1db8d8722ce
parent3b915aaf8dd3bbf78c516564dfe36dacde40a30e
parent3ad12a31bdfaa654a808b6fbc94aac70270262cd
Merge branch '4.6' of https://github.com/civicrm/civicrm-core

Conflicts:
xml/templates/civicrm_data.tpl
CRM/Contribute/BAO/Query.php
CRM/Contribute/Form/Search.php
CRM/Core/Controller.php
xml/templates/civicrm_data.tpl