Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-11-23-22-46-27
authorKurund Jalmi <kurund@yahoo.com>
Mon, 23 Nov 2015 17:31:42 +0000 (23:01 +0530)
committerKurund Jalmi <kurund@yahoo.com>
Mon, 23 Nov 2015 17:31:42 +0000 (23:01 +0530)
commita5b08a92f51c39c668edf05a5db3b199a300ddde
tree71685926c13baf3400799f06e33c8c82b31388de
parent02d37a3e31df5ba1e24166c1136befc418254672
parentcec72d325951873bfade038e8bd1304b6bd93841
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-11-23-22-46-27
12 files changed:
CRM/Activity/BAO/Activity.php
CRM/Case/BAO/Case.php
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/Form/Contribution.php
CRM/Report/Form.php
CRM/Report/Form/Case/Detail.php
CRM/Report/Form/Case/Summary.php
CRM/Utils/System/WordPress.php
CRM/Utils/Type.php
tests/phpunit/CiviTest/CiviSeleniumTestCase.php
tests/phpunit/WebTest/Contribute/StandaloneAddTest.php
tests/phpunit/WebTest/Member/EditMembershipTest.php