Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-03-14-00-44-17

Conflicts:
	CRM/Export/BAO/Export.php
	xml/GenCode.php

diff --cc CRM/Contact/BAO/Query.php
Simple merge

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

diff --cc CRM/Core/Error.php
Simple merge

diff --cc CRM/Event/Form/Participant.php
index f8928cb9dec724ffe403da5940e2f3c4ae330190,ab7db86f829c39ebbc2a1ea3d5e53d90ddb9ee68..8e8ae29ea5096ec104bfe1b9c7fe61387df84a32
--- 1/CRM/Event/Form/Participant.php
--- 2/CRM/Event/Form/Participant.php
+++ b/CRM/Event/Form/Participant.php
@@@ -1753,4 -1797,5 +1756,4 @@@ SELECT civicrm_custom_group.name as nam
          ));
      }
    }
- }
+ }
 -

diff --cc CRM/Export/BAO/Export.php
Simple merge

diff --cc CRM/Mailing/BAO/Mailing.php
Simple merge

diff --cc CRM/Member/BAO/Membership.php
Simple merge

diff --cc CRM/Member/BAO/Query.php
Simple merge

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

diff --cc templates/CRM/Contact/Form/Inline/ContactInfo.tpl
Simple merge

diff --cc templates/CRM/Contact/Page/View/Summary.js
index bc2e7854b4b8df233b4e5ae7af1852cc13c64137,e8c76d22d9fcd424d556433510f4a0ac18769d75..f55262ca6e61dac8e4a55ad386fdcf88c7119cb9
--- 1/templates/CRM/Contact/Page/View/Summary.js
--- 2/templates/CRM/Contact/Page/View/Summary.js
+++ b/templates/CRM/Contact/Page/View/Summary.js
@@@ -53,8 -43,9 +53,9 @@@
  
    function requestHandler(response) {
      var o = $('div.crm-inline-edit.form');
+     $('form', o).ajaxFormUnbind();
  
 -    if (response.status == 'save' || response.status == 'cancel') {
 +    if (response.status == 'success' || response.status == 'cancel') {
        o.trigger('crmFormSuccess', [response]);
        $('.crm-inline-edit-container').addClass('crm-edit-ready');
        var data = o.data('edit-params');