Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-13-15-43-24
authorKurund Jalmi <kurund@civicrm.org>
Mon, 13 May 2013 20:01:48 +0000 (16:01 -0400)
committerKurund Jalmi <kurund@civicrm.org>
Mon, 13 May 2013 20:01:48 +0000 (16:01 -0400)
commit65c1908a1f7525d97f99c99017f53a790566babd
treed9f56e4855a2eb6ea75da93cf3eae13d3b83feba
parentb873029bc1a3ca4c9475b4818932031f709dc9ef
parent11ee5a3044ff6880abd30e8a6791f828fe7d41be
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-13-15-43-24

Conflicts:
CRM/Case/Form/Activity.php
CRM/Utils/REST.php
sql/civicrm_generated.mysql
xml/version.xml
15 files changed:
CRM/Case/BAO/Case.php
CRM/Case/Form/Activity.php
CRM/Contact/BAO/Contact.php
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/BAO/Query.php
CRM/Contribute/Form/Contribution/Confirm.php
CRM/Core/BAO/Block.php
CRM/Core/Payment/AuthorizeNet.php
CRM/Event/Info.php
CRM/Mailing/Info.php
CRM/Report/Form.php
templates/CRM/Contribute/Form/Contribution.tpl
tests/phpunit/CiviTest/CiviSeleniumSettings.php.txt
tests/phpunit/CiviTest/CiviSeleniumTestCase.php
xml/GenCode.php