Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-30-23-34-40
authorKurund Jalmi <kurund@yahoo.com>
Thu, 30 Jul 2015 18:09:08 +0000 (23:39 +0530)
committerKurund Jalmi <kurund@yahoo.com>
Thu, 30 Jul 2015 18:09:08 +0000 (23:39 +0530)
commit222a33ae2f05a4da40bcbac3f7bed583a11341c6
tree0069cde999a85005f9c96177d827619721a4aa30
parente20ee18d3b303c02dd3b6f9a2a16a341df3dff17
parent36e09d54ef2a02b896901930f1a20f4e3b4c14c2
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-30-23-34-40

Conflicts:
CRM/Contribute/BAO/Contribution/Utils.php
CRM/Contribute/BAO/ContributionPage.php
CRM/Contribute/Form/Contribution.php
CRM/Member/BAO/Membership.php
15 files changed:
CRM/Case/XMLProcessor/Report.php
CRM/Contact/BAO/Group.php
CRM/Contact/BAO/Query.php
CRM/Contact/Page/AJAX.php
CRM/Contribute/BAO/Contribution/Utils.php
CRM/Contribute/BAO/Query.php
CRM/Core/BAO/CustomField.php
CRM/Core/Form.php
CRM/Event/BAO/Event.php
CRM/Event/Form/ManageEvent/Registration.php
CRM/Event/Form/Registration.php
bower.json
composer.json
css/civicrm.css
js/model/crm.uf.js