Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-01-08-12-03-28

Conflicts:
	CRM/Contribute/Page/Tab.php

diff --cc CRM/Activity/BAO/Activity.php
Simple merge

diff --cc CRM/Contact/BAO/Query.php
Simple merge

diff --cc CRM/Contact/BAO/Relationship.php
Simple merge

diff --cc CRM/Contact/Form/Search/Custom/Group.php
Simple merge

diff --cc CRM/Contribute/Form/ContributionBase.php
Simple merge

diff --cc CRM/Contribute/Page/Tab.php
index 7edef06acc9e36deb1f0bed88a9de0086499bb3c,f6fc59983e2d48867aa6ca576fb50165b3c45c89..c957f6ad048625a3bac6f9d94d556d918ccc2a11
--- 1/CRM/Contribute/Page/Tab.php
--- 2/CRM/Contribute/Page/Tab.php
+++ b/CRM/Contribute/Page/Tab.php
@@@ -166,7 -166,8 +166,8 @@@ class CRM_Contribute_Page_Tab extends C
      $controller->reset();
      $controller->set('cid', $this->_contactId);
      $controller->set('crid', $this->_crid);
 -    $controller->set('context', 'contribution');
 +    $controller->set('context', 'Search');
+     $controller->set('limit', 50);
      $controller->process();
      $controller->run();
  

diff --cc CRM/Upgrade/TwoTwo/Form/Step3.php
Simple merge

diff --cc templates/CRM/Price/Form/Calculate.tpl
Simple merge