Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-14-11-04-09
authorKurund Jalmi <kurund@yahoo.com>
Wed, 14 Oct 2015 10:21:42 +0000 (11:21 +0100)
committerKurund Jalmi <kurund@yahoo.com>
Wed, 14 Oct 2015 10:21:42 +0000 (11:21 +0100)
commit0fccb17f3cf8138fc43aed4b48fd23a38394bbf8
tree3db37f55c34c6c6ab0d7dc9e04fc7ad1c0759fd7
parentce9ed3a7b442c169e31245a016280b6223d31f78
parent84b467e82c5f0fb7ecbc372ce7e79efd011cb076
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-14-11-04-09

Conflicts:
CRM/Core/Payment/PayPalImpl.php
sql/civicrm_generated.mysql
tests/phpunit/api/v3/SyntaxConformanceTest.php
xml/templates/civicrm_sample.tpl
CRM/Contribute/Form/Task/Invoice.php
CRM/Core/BAO/LocationType.php
CRM/Core/Payment/PayPalImpl.php
CRM/Mailing/Info.php
tests/phpunit/api/v3/SyntaxConformanceTest.php