Merge branch '4.6' into 'master'
authorColeman Watts <coleman@civicrm.org>
Thu, 4 Jun 2015 14:34:21 +0000 (10:34 -0400)
committerColeman Watts <coleman@civicrm.org>
Thu, 4 Jun 2015 14:34:21 +0000 (10:34 -0400)
commit757fc7f21936ac57c7e33ab93aa4490407cf9c8b
tree51e0668524ca0c987fe2f3d69d0a3b534d4a0db0
parent9796f0152ed3abd55c0e995f84f4d56ff48b26ba
parent551855c1e8cd38d0f23f851a8947357343e5e8f8
Merge branch '4.6' into 'master'

Conflicts:
tools/CRM/Auction/BAO/Auction.php
tools/CRM/Auction/BAO/Item.php
tools/CRM/Auction/Form/Auction.php
tools/CRM/Auction/Form/Item.php
CRM/Batch/Form/Entry.php
CRM/Contact/Form/Contact.php
CRM/Contribute/Form/Task/Invoice.php
CRM/Core/BAO/RecurringEntity.php
CRM/Core/BAO/UFGroup.php
CRM/Core/Form.php
CRM/Core/Payment.php
CRM/Core/Payment/AuthorizeNet.php
CRM/Core/Payment/PayPalImpl.php
js/crm.ajax.js