Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-01-18-17-02-24
authorTim Otten <totten@civicrm.org>
Sun, 19 Jan 2014 01:20:23 +0000 (17:20 -0800)
committerTim Otten <totten@civicrm.org>
Sun, 19 Jan 2014 01:20:23 +0000 (17:20 -0800)
commit9b10578bd1e1895cf21e39ff16d3363e5419b591
tree5460631d5b689c517359c29e2efbf40928bf6244
parentf6834dcc07b54fe099c34a4384d0e4291844c8b4
parent144fb5a038cbfa3b1101fcf0662cc0a90e2e6687
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-01-18-17-02-24

Conflicts:
CRM/Contribute/Form/Contribution/Main.php
api/v3/Generic/Setvalue.php
templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
21 files changed:
CRM/Admin/Form/Setting/UpdateConfigBackend.php
CRM/Contact/BAO/Query.php
CRM/Contact/Form/Edit/Address.php
CRM/Contact/Form/Search/Builder.php
CRM/Contact/Selector.php
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/Form/Contribution/Main.php
CRM/Core/BAO/ActionSchedule.php
CRM/Core/BAO/Mapping.php
CRM/Core/Invoke.php
CRM/Event/Form/ManageEvent/Fee.php
CRM/Event/Form/Registration/Register.php
CRM/Export/BAO/Export.php
CRM/Mailing/Form/Upload.php
CRM/Report/Form.php
api/v3/Generic/Setvalue.php
api/v3/utils.php
css/civicrm.css
templates/CRM/Contribute/Form/Contribution/Main.tpl
templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
templates/CRM/Contribute/Form/SoftCredit.tpl