Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-07-14-23-03
authorKurund Jalmi <kurund@yahoo.com>
Wed, 7 Oct 2015 11:27:15 +0000 (12:27 +0100)
committerKurund Jalmi <kurund@yahoo.com>
Wed, 7 Oct 2015 11:27:15 +0000 (12:27 +0100)
commit695f5ebdf8c60a9ad53232f7f88f454037715ef8
tree39b4688c0f75a8d542c13a9f6f506988e4603eb8
parent948168d184949f662e62af6fa7558ea093b5902c
parent1c4ab962045c29149292c4549620866d41816836
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-07-14-23-03

Conflicts:
CRM/Contribute/BAO/Contribution.php
CRM/Core/Payment/BaseIPN.php
CRM/Extension/Manager/Payment.php
CRM/Upgrade/Incremental/sql/4.6.6.mysql.tpl
README.txt
sql/civicrm_generated.mysql
templates/CRM/common/success.tpl
tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php
18 files changed:
CRM/Core/BAO/Navigation.php
CRM/Core/CommunityMessages.php
CRM/Queue/Runner.php
CRM/Report/BAO/ReportInstance.php
CRM/Upgrade/Page/Upgrade.php
CRM/Utils/System.php
README.txt
ang/crmUi.js
js/Common.js
settings/Core.setting.php
sql/GenerateData.php
sql/GenerateReportData.php
templates/CRM/Admin/Page/APIExplorer.js
templates/CRM/Admin/Page/PaymentProcessor.hlp
templates/CRM/Report/Page/Options.tpl
templates/CRM/common/success.tpl
xml/templates/civicrm_navigation.tpl
xml/templates/civicrm_sample.tpl