From: Kurund Jalmi <kurund@yahoo.com>
Date: Wed, 7 Oct 2015 11:27:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-07-14-23-03
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=695f5ebdf8c60a9ad53232f7f88f454037715ef8;p=civicrm-core.git

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
---

695f5ebdf8c60a9ad53232f7f88f454037715ef8
diff --cc README.txt
index cb5d9f4143,8a256ed4c5..90e865c879
--- a/README.txt
+++ b/README.txt
@@@ -24,21 -24,20 +24,23 @@@ and WordPress content management system
  *************************
  2. Installation
  *************************
- Links to download the full CiviCRM package are on our website:
- http://civicrm.org/go/download
+ The download URLs and installation instructions are available on our
+ website:
+ 
+ https://civicrm.org/download
  
 +Installation instruction can be found on the wiki:
 +http://wiki.civicrm.org/
 +
  
  *************************
  3. Documentation
  *************************
  Documentation, as well as the project bug tracker and mailing lists,
- can be found at http://civicrm.org/ Just click on the appropriate link.
+ can be found at https://civicrm.org/ Just click on the appropriate link.
  
 -Our main documentation site is the wiki at http://wiki.civicrm.org/
 -- particularly http://docs.civicrm.org/
 +Our main documentation site is the CiviCRM wiki:
 +http://wiki.civicrm.org/
  
  
  *************************