Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-24-22-26-45
authorKurund Jalmi <kurund@yahoo.com>
Mon, 24 Aug 2015 18:37:52 +0000 (00:07 +0530)
committerKurund Jalmi <kurund@yahoo.com>
Mon, 24 Aug 2015 18:37:52 +0000 (00:07 +0530)
commit65af936e3055779f3b6e8134218314397efc1e57
tree59f5736685b844d1c8c9a124933049a6e7fdace8
parent63f63f5a548ec1293e4daf26fd84349f72e2e6c4
parent9919a36caa6549372ae3ed99a26a507b0a246289
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-24-22-26-45

Conflicts:
CRM/Contact/BAO/Relationship.php
CRM/Member/Form/Membership.php
sql/civicrm_generated.mysql
tests/phpunit/api/v3/CustomValueTest.php
xml/version.xml
19 files changed:
CRM/Admin/Page/AJAX.php
CRM/Case/BAO/Query.php
CRM/Contact/BAO/Query.php
CRM/Contact/BAO/Relationship.php
CRM/Contribute/Form/Contribution.php
CRM/Contribute/Form/Task/Invoice.php
CRM/Core/BAO/CustomField.php
CRM/Core/BAO/CustomQuery.php
CRM/Core/BAO/CustomValueTable.php
CRM/Core/DAO/permissions.php
CRM/Core/Payment/Form.php
CRM/Core/Payment/ProcessorForm.php
CRM/Mailing/Info.php
CRM/Report/Form/Activity.php
api/v3/utils.php
templates/CRM/Case/Form/Search/Common.tpl
templates/CRM/Core/BillingBlock.tpl
templates/CRM/common/SocialNetwork.tpl
tests/phpunit/api/v3/CustomValueTest.php