Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-01-08-12-03-28
authorkurund <kurund@civicrm.org>
Wed, 8 Jan 2014 20:05:03 +0000 (12:05 -0800)
committerkurund <kurund@civicrm.org>
Wed, 8 Jan 2014 20:05:03 +0000 (12:05 -0800)
commitca5bec87585757261df111b0ba58a4c236ac2cf8
treea2170ebba099e57b2c5e88cc4f726b6105030da9
parent1acf008cee9b093f73781431cc656260d67d06fe
parent6ab3675040716dd3e0494c9fb6095b5ede718500
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-01-08-12-03-28

Conflicts:
CRM/Contribute/Page/Tab.php
CRM/Activity/BAO/Activity.php
CRM/Contact/BAO/Query.php
CRM/Contact/BAO/Relationship.php
CRM/Contact/Form/Search/Custom/Group.php
CRM/Contribute/Form/ContributionBase.php
CRM/Contribute/Page/Tab.php
CRM/Upgrade/TwoTwo/Form/Step3.php
templates/CRM/Price/Form/Calculate.tpl