Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-01-13-11-57-38
authorkurund <kurund@civicrm.org>
Mon, 13 Jan 2014 20:07:24 +0000 (12:07 -0800)
committerkurund <kurund@civicrm.org>
Mon, 13 Jan 2014 20:07:24 +0000 (12:07 -0800)
commitb2aaa85e468d3720fd624080fe72b896270ba89a
treea960ad5728d3b43a7e26877673049e4a630227fd
parent1489d3c86ba3ebfe0a18646aa9d79cd5efc08d16
parent2f7679961c18fe6f3fad1037f8a837eec64fc8cd
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-01-13-11-57-38

Conflicts:
CRM/Core/Form/Tag.php
16 files changed:
CRM/Activity/Form/Activity.php
CRM/Admin/Page/AJAX.php
CRM/Case/Form/Case.php
CRM/Case/Form/CaseView.php
CRM/Case/Page/AJAX.php
CRM/Contact/BAO/Contact/Utils.php
CRM/Contact/BAO/Group.php
CRM/Contact/Form/Edit/TagsAndGroups.php
CRM/Contribute/Form/Contribution.php
CRM/Contribute/Form/SoftCredit.php
CRM/Core/BAO/File.php
CRM/Core/Form.php
CRM/Core/Form/Tag.php
CRM/Utils/Hook.php
js/Common.js
sql/civicrm_generated.mysql