Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-28-22-50-49
authorkurund <kurund@civicrm.org>
Thu, 28 May 2015 17:39:08 +0000 (23:09 +0530)
committerkurund <kurund@civicrm.org>
Thu, 28 May 2015 17:39:08 +0000 (23:09 +0530)
commit339572088621ed2b6d3a74ff12e82b40d835965c
tree8bf6ebcd2be2033ab66cc3bff90b8b42530173f6
parent1e059eef2fa3ebf8a3cd91a9c90facafe9b15e77
parent1e140496ea88ab43bc5086fd089e870955d66038
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-28-22-50-49

Conflicts:
ang/crmUi.js
sql/civicrm_generated.mysql
xml/version.xml
12 files changed:
CRM/Batch/Form/Entry.php
CRM/Case/XMLProcessor/Report.php
CRM/Contribute/BAO/Query.php
CRM/Contribute/Form/Contribution.php
CRM/Contribute/Form/Contribution/Main.php
CRM/Core/BAO/CustomField.php
CRM/Core/BAO/CustomGroup.php
CRM/Core/Resources.php
CRM/Mailing/BAO/Mailing.php
CRM/Profile/Page/MultipleRecordFieldsListing.php
CRM/Utils/Hook.php
ang/crmUi.js