Merge branch '4.6' of https://github.com/civicrm/civicrm-core
authoreileenmcnaugton <eileen@fuzion.co.nz>
Thu, 26 Nov 2015 08:11:03 +0000 (21:11 +1300)
committereileenmcnaugton <eileen@fuzion.co.nz>
Thu, 26 Nov 2015 08:11:03 +0000 (21:11 +1300)
commit11a1ad01c57740352bf558e9ac326ef341fde5bb
tree99caa39dfcdc4ec3b16777f89ef63b49a41378d1
parentcddf84f51aacdf9b2ef8ac4ac134ef0c4227d4e6
parente9404bcef28ef009d278fedc9b67715310eaa57d
Merge branch '4.6' of https://github.com/civicrm/civicrm-core

Conflicts:
CRM/Core/Payment/AuthorizeNetIPN.php
tests/phpunit/CRM/Core/BAO/FinancialTrxnTest.php
tests/phpunit/CRM/Core/Payment/BaseIPNTest.php
tests/phpunit/CiviTest/CiviUnitTestCase.php
tests/phpunit/api/v3/ContributionPageTest.php
tests/phpunit/api/v3/ContributionTest.php
tests/phpunit/api/v3/PledgePaymentTest.php
tests/phpunit/api/v3/TaxContributionPageTest.php
CRM/Core/Payment/AuthorizeNetIPN.php
js/crm.searchForm.js
js/jquery/jquery.dashboard.js
tests/phpunit/api/v3/ContributionPageTest.php