CRM-15113 don't redirect if rgid is not filled in  - otherwise you wind up at an unfiltered dedupe calculation screen
CRM-15113 - adding a refresh where the redirect would otherwise be causes the user to wind up back on the search page and to get the alert
CRM-15096
Merge pull request #3873 from jitendrapurohit/CRM-15096

CRM-15096
Add function to set up an ACL for a test
test fix Only variables should be assigned by reference

/var/www/drupal/sites/default/modules/civicrm/civicrm-core/CRM/ACL/BAO/ACL.php:541
ACL Core, add a way for unit tests to flush in-function cache
CRM-15148 add tests to check impact of ACLs on contributions
testEntitiesGetCoreACLLimitingHookNoCheck fails without the commit to the api file
(next commit)

reinstate deleted functions
CRM-15148 fix api to pass check_permissions
this results in core acls but NOT hook acls being applied IF check_permissions=1
prior to this patch core acls but NOT hook acls were applied even if check_permissions =0
CRM-15148 make core ACL test incomplete as the security fix for CRM-14877 is not in 4.4
Merge pull request #3877 from eileenmcnaughton/CRM-15148

Crm 15148
Merge pull request #3837 from eileenmcnaughton/CRM-15113

CRM-15113 don't redirect to server killing screen after marking dedupe
pull clickatell extension out of core (to veda repo)
remove clickatell zip file
fixed merge forward, CRM-12772

----------------------------------------
* CRM-12772: Member Report (Detail) locks in DB with large membership/contribution sets
  https://issues.civicrm.org/jira/browse/CRM-12772
Merge pull request #3919 from kurund/CRM-12772

fixed wrong merge forward, CRM-12772
fixes for CRM-15133

----------------------------------------
* CRM-15133: Do not display upgrade reminder in footer if versionAlert is false
  https://issues.civicrm.org/jira/browse/CRM-15133
Merge pull request #3920 from kurund/CRM-15133

fixes for CRM-15133
version fixes
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-25-10-57-01

Conflicts:
	tests/phpunit/CiviTest/CiviUnitTestCase.php