Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-03-20-15-52-17
authorTim Otten <totten@civicrm.org>
Thu, 20 Mar 2014 22:54:02 +0000 (15:54 -0700)
committerTim Otten <totten@civicrm.org>
Thu, 20 Mar 2014 22:54:02 +0000 (15:54 -0700)
commit53128a92d19ec8f0526b48a4a0c044bb0d671d84
treef828a5424e100eec8c7125ccd8d9be5ee62c8156
parent32655511a84d25e5dd5e15012cd4dcc4cfa01ba3
parent0b3a266c74f4e57a7978d0d6105dc8f56edd23d4
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-03-20-15-52-17

Conflicts:
CRM/Core/BAO/UFGroup.php
CRM/Activity/BAO/Query.php
CRM/Contact/BAO/Query.php
CRM/Core/BAO/UFGroup.php
CRM/Core/DAO.php
CRM/Core/Payment/AuthorizeNetIPN.php
CRM/Event/Form/Registration/Register.php
api/v3/Contribution.php
api/v3/Participant.php
api/v3/utils.php
tests/phpunit/api/v3/SyntaxConformanceTest.php