Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-09-05-17-42-45
authorKurund Jalmi <kurund@yahoo.com>
Sun, 6 Sep 2015 01:07:09 +0000 (18:07 -0700)
committerKurund Jalmi <kurund@yahoo.com>
Sun, 6 Sep 2015 01:07:09 +0000 (18:07 -0700)
commit56a4dcb3cdddcdc5831e89a0cf76f51a1e8e4a25
tree57a42199663ba09bfcc582117fa1f095e23d603d
parentce7d89905614f468462d46e975661311e5d1468a
parentc9e0639595193269d4cddf1c4f05e1a341041174
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-09-05-17-42-45

Conflicts:
CRM/Case/BAO/Query.php
CRM/Member/Form/MembershipRenewal.php
CRM/Utils/Check/Security.php
sql/civicrm_generated.mysql
xml/templates/civicrm_country.tpl
25 files changed:
CRM/Batch/BAO/Batch.php
CRM/Case/BAO/Query.php
CRM/Contact/BAO/ProximityQuery.php
CRM/Contact/BAO/Query.php
CRM/Contact/BAO/RelationshipType.php
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/BAO/Query.php
CRM/Contribute/Form/UpdateBilling.php
CRM/Core/BAO/ActionSchedule.php
CRM/Core/OptionGroup.php
CRM/Core/Smarty/plugins/function.crmAPI.php
CRM/Event/BAO/Event.php
CRM/Financial/Form/BatchTransaction.php
CRM/Financial/Page/AJAX.php
CRM/Member/Form/MembershipType.php
CRM/Utils/Check/Security.php
api/v3/Domain.php
api/v3/MembershipType.php
extern/widget.php
templates/CRM/Admin/Form/Job.tpl
templates/CRM/Admin/Page/APIExplorer.tpl
tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
tests/phpunit/api/v3/DomainTest.php
tests/phpunit/api/v3/MembershipTypeTest.php
xml/templates/civicrm_country.tpl