Merge branch '4.6' into master
authorColeman Watts <coleman@civicrm.org>
Thu, 19 Nov 2015 02:12:30 +0000 (21:12 -0500)
committerColeman Watts <coleman@civicrm.org>
Thu, 19 Nov 2015 02:12:30 +0000 (21:12 -0500)
commitd5e5f8438fe2777954f815731e1422c367624bea
tree2f8d8ba3d1b6d529db80f9975eb67ec77619a7b4
parent32530d129f1d474b9a0083b1a102b20fcfc40c5c
parenta6162ae224890f0852b1db0c767c811f3c4baae1
Merge branch '4.6' into master

Conflicts:
CRM/Case/Form/Search.php
tests/phpunit/WebTest/Contribute/PCPAddTest.php
tests/phpunit/WebTest/Member/InheritedMembershipTest.php
tests/phpunit/WebTest/Member/OnlineMembershipRenewTest.php
14 files changed:
CRM/Case/Form/Search.php
CRM/Contact/Form/DedupeRules.php
CRM/Dedupe/Finder.php
CRM/Report/Form/Event/ParticipantListing.php
install/index.php
templates/CRM/Admin/Page/APIExplorer.js
tests/phpunit/WebTest/ACL/AssignUsersToRolesTest.php
tests/phpunit/WebTest/Case/CaseDashboardTest.php
tests/phpunit/WebTest/Contact/DupeContactTest.php
tests/phpunit/WebTest/Contribute/PCPAddTest.php
tests/phpunit/WebTest/Event/AddEventTest.php
tests/phpunit/WebTest/Event/ParticipantSearchTest.php
tests/phpunit/WebTest/Member/InheritedMembershipTest.php
tests/phpunit/WebTest/Member/OfflineMembershipRenewTest.php