Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-21-08-12-12
authorkurund <kurund@civicrm.org>
Mon, 21 Apr 2014 15:51:45 +0000 (08:51 -0700)
committerkurund <kurund@civicrm.org>
Mon, 21 Apr 2014 15:51:45 +0000 (08:51 -0700)
commitd031c654f72b36c9f4d88bdb3dd55ddbadb98535
tree96950035abfad820d8adeeb42325a2f3ee76a00d
parentb00168a44887cc1fa1d88cc3d9081e04e0d3411a
parent415db340895dd93218ef2fe3b70d73d094ef6004
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-21-08-12-12

Conflicts:
CRM/Contact/Page/AJAX.php
CRM/Core/Payment.php
CRM/Event/Form/Registration/Register.php
api/v3/Membership.php
api/v3/utils.php
sql/civicrm_generated.mysql
xml/version.xml
41 files changed:
CRM/Batch/BAO/Batch.php
CRM/Batch/Form/Batch.php
CRM/Batch/Form/Entry.php
CRM/Batch/Page/AJAX.php
CRM/Case/BAO/Case.php
CRM/Contact/BAO/Query.php
CRM/Contact/BAO/Relationship.php
CRM/Contact/Form/Search/Builder.php
CRM/Contact/Import/Parser/Contact.php
CRM/Contact/Page/AJAX.php
CRM/Contact/Selector.php
CRM/Contribute/Form/AbstractEditPayment.php
CRM/Contribute/Form/Task/PDFLetter.php
CRM/Core/BAO/CustomQuery.php
CRM/Core/Config.php
CRM/Core/Config/Defaults.php
CRM/Core/Invoke.php
CRM/Core/Menu.php
CRM/Core/Payment.php
CRM/Core/Session.php
CRM/Dedupe/Merger.php
CRM/Event/Form/Registration/Register.php
CRM/Financial/Form/Export.php
CRM/Financial/Form/Search.php
CRM/Financial/Page/AJAX.php
CRM/Logging/Schema.php
CRM/Member/BAO/Query.php
CRM/PCP/BAO/PCP.php
CRM/PCP/Form/PCPAccount.php
CRM/PCP/Page/PCPInfo.php
CRM/Upgrade/Incremental/php/FourFour.php
CRM/Utils/Check/Security.php
CRM/Utils/System/Joomla.php
CRM/Utils/System/WordPress.php
api/v3/Contact.php
api/v3/Membership.php
api/v3/utils.php
templates/CRM/Report/Form/Layout/Table.tpl
tests/phpunit/api/v3/ContactTest.php
tests/phpunit/api/v3/MembershipTest.php
xml/version.xml