Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-23-14-48-29
authorTim Otten <totten@civicrm.org>
Mon, 23 Jun 2014 22:12:52 +0000 (15:12 -0700)
committerTim Otten <totten@civicrm.org>
Mon, 23 Jun 2014 22:12:52 +0000 (15:12 -0700)
commitbada0f6668a8f2b1dd3210b7ecfa81db50e9f76d
tree815c084437e381321d73034636963e36fa00ebdb
parentb4fff7fc34a309bbdc70a5accfa9506e80df04ac
parentf62f5e8b0ddd7ed7aa4bc59ebb253be0c51245af
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-23-14-48-29

Conflicts:
CRM/Core/Invoke.php
CRM/Profile/Form.php
CRM/Profile/Form/Edit.php
api/v3/utils.php
16 files changed:
CRM/Activity/Form/Task/Delete.php
CRM/Contact/Form/Task/Batch.php
CRM/Core/I18n.php
CRM/Core/Lock.php
CRM/Core/Payment/AuthorizeNetIPN.php
CRM/Core/Payment/PayPalProIPN.php
CRM/Mailing/BAO/MailingJob.php
CRM/Profile/Form.php
CRM/Profile/Form/Edit.php
CRM/Profile/Page/Router.php
CRM/Utils/Address.php
CRM/Utils/Check/Env.php
CRM/Utils/Time.php
api/v3/utils.php
tests/phpunit/api/v3/DomainTest.php
tests/phpunit/api/v3/GrantTest.php