Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-06-01-22-27-06
authorkurund <kurund@civicrm.org>
Mon, 1 Jun 2015 17:08:20 +0000 (22:38 +0530)
committerkurund <kurund@civicrm.org>
Mon, 1 Jun 2015 17:08:20 +0000 (22:38 +0530)
commit991466ed3caa6bc4ee96b4d8a2e0b4b6b1efcd93
tree479f388c9fd7f0533524a9bb471f627ccc6d2e61
parent7f2a55a3836482ed233a1cc248da534473ff1a7b
parent8fa0afca29d29808d4c4a111369b9370833bceeb
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-06-01-22-27-06

Conflicts:
CRM/Contribute/Form/Contribution/Main.php
CRM/Contact/Form/Relationship.php
CRM/Contribute/Form/Contribution/Main.php
CRM/Core/Form.php
CRM/Event/Form/Registration/Register.php
js/crm.ajax.js
templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl