Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-12-15-44-44
authorKurund Jalmi <kurund@yahoo.com>
Wed, 12 Aug 2015 10:50:08 +0000 (16:20 +0530)
committerKurund Jalmi <kurund@yahoo.com>
Wed, 12 Aug 2015 10:50:08 +0000 (16:20 +0530)
commit1b7f28641258a752d96349cd87c984beba844316
treef1b3f8c53384f1af82af37be46da32230d6e6530
parent8fa16e027057b92571ea02c8dc659d5a70f0f84c
parent75e91b53425d22238ce723c12f39305d25f712ba
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-12-15-44-44

Conflicts:
CRM/Contribute/BAO/Contribution/Utils.php
templates/CRM/Contribute/Form/Contribution/Main.tpl
tests/phpunit/CiviTest/CiviSeleniumTestCase.php
CRM/Activity/Form/Activity.php
CRM/Contribute/BAO/Contribution/Utils.php
CRM/Core/BAO/CustomField.php
CRM/Export/BAO/Export.php
CRM/Price/BAO/PriceField.php
api/v3/OptionValue.php
templates/CRM/Contribute/Form/Contribution/Confirm.tpl
templates/CRM/Contribute/Form/Contribution/Main.tpl
templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
tests/phpunit/CiviTest/CiviSeleniumTestCase.php
tests/phpunit/WebTest/Member/OnlineMembershipCreateTest.php