Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-04-16-10-35-08

Conflicts:
	sql/civicrm_generated.mysql
	xml/version.xml

diff --cc CRM/Contribute/Form/Contribution.php
Simple merge

diff --cc CRM/Utils/REST.php
Simple merge

diff --cc api/v3/examples/SettingGetfields.php
index 9d5a522449dadb8bddf4188a9800fdc9076f3ee1,869430aa520d474dadc4acafbf962db74c6a30c7..c303a49739048ea953174bd9e119a3552828dc99
--- 1/api/v3/examples/SettingGetfields.php
--- 2/api/v3/examples/SettingGetfields.php
+++ b/api/v3/examples/SettingGetfields.php
@@@ -664,7 -688,7 +688,7 @@@ When enabled, statistics about your Civ
            'title' => 'Enable Debugging',
            'is_domain' => 1,
            'is_contact' => 0,
--          'description' => 'Set this value to Yes if you want to use one of CiviCRM's debugging tools. This feature should NOT be enabled for production sites',
++          'description' => 'Set this value to Yes if you want to use one of CiviCRM\'s debugging tools. This feature should NOT be enabled for production sites',
            'prefetch' => 1,
            'help_text' => 'Do not turn this on on production sites',
          ),
@@@ -682,8 -706,8 +706,8 @@@
            'is_contact' => 0,
            'description' => 'Set this value to Yes if you want CiviCRM error/debugging messages to also appear in Drupal error logs',
            'prefetch' => 1,
--          'help_text' => 'Set this value to Yes if you want CiviCRM error/debugging messages the appear in your CMS' error log.
--In the case of Drupal, this will cause all CiviCRM error messages to appear in the watchdog (assuming you have Drupal's watchdog enabled)',
++          'help_text' => 'Set this value to Yes if you want CiviCRM error/debugging messages the appear in your CMS\' error log.
++In the case of Drupal, this will cause all CiviCRM error messages to appear in the watchdog (assuming you have Drupal\'s watchdog enabled)',
          ),
        'backtrace' => array( 
            'group_name' => 'Developer Preferences',

diff --cc templates/CRM/Activity/Form/Activity.tpl
Simple merge