Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-05-17-16-30
authorkurund <kurund@civicrm.org>
Thu, 6 Feb 2014 01:31:12 +0000 (17:31 -0800)
committerkurund <kurund@civicrm.org>
Thu, 6 Feb 2014 01:31:12 +0000 (17:31 -0800)
commit0ce8483729744eef1649ad91f908fda25ee5223f
treefc204d570485e26b4d511107d4b97ef4e043aadc
parenta5685d555810e54c6a9aa9c01527722a707a2107
parent25314c391fa95bf3af18c0060a51f3e8d5213489
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-05-17-16-30

Conflicts:
tests/phpunit/api/v3/GroupContactTest.php
20 files changed:
CRM/Activity/BAO/Activity.php
CRM/Contact/BAO/Query.php
CRM/Core/BAO/ActionSchedule.php
CRM/Core/Config.php
CRM/Core/DAO.php
CRM/Core/Page.php
CRM/Event/xml/Menu/Event.xml
CRM/Mailing/Form/Group.php
CRM/Profile/Selector/Listings.php
CRM/Report/Form.php
CRM/Report/Form/Case/Demographics.php
CRM/Report/Form/Event/ParticipantListCount.php
CRM/Utils/System/Drupal.php
CRM/Utils/Token.php
api/api.php
api/v3/utils.php
tests/phpunit/api/v3/GroupContactTest.php
tests/phpunit/api/v3/SyntaxConformanceTest.php
xml/schema/Activity/ActivityContact.xml
xml/schema/Core/Website.xml