Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-09-21-44-34
authorkurund <kurund@civicrm.org>
Mon, 9 Mar 2015 16:27:45 +0000 (21:57 +0530)
committerkurund <kurund@civicrm.org>
Mon, 9 Mar 2015 16:27:45 +0000 (21:57 +0530)
commitb71cb96619f284fb007d4365c33f59f088573d8f
treee370c1186d8e2efa5adf27d40860605139129423
parent123d0a1992203a52c71dfab3c77fca7f9409f906
parent592ed22c9447a2ac8f8558de48349f946b8e4ed6
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-09-21-44-34

Conflicts:
CRM/Contact/Page/AJAX.php
CRM/Core/Form.php
CRM/Core/Page/AJAX.php
sql/civicrm_generated.mysql
xml/version.xml
17 files changed:
CRM/Activity/Page/AJAX.php
CRM/Batch/Page/AJAX.php
CRM/Campaign/Page/AJAX.php
CRM/Contact/Page/AJAX.php
CRM/Core/Form.php
CRM/Core/Page/AJAX.php
CRM/Core/xml/Menu/Contact.xml
CRM/Financial/Page/AJAX.php
CRM/Group/Page/AJAX.php
CRM/Mailing/BAO/Component.php
CRM/Mailing/BAO/Mailing.php
CRM/Mailing/Form/Component.php
CRM/Mailing/Page/AJAX.php
CRM/Pledge/Page/AJAX.php
api/v3/MailingComponent.php
api/v3/MessageTemplate.php
templates/CRM/Contact/Page/View/Summary.js