Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-07-14-13-42-39
authorkurund <kurund@civicrm.org>
Mon, 14 Jul 2014 09:29:02 +0000 (14:59 +0530)
committerkurund <kurund@civicrm.org>
Mon, 14 Jul 2014 09:29:02 +0000 (14:59 +0530)
commit3838662faff56daff7b4fbbd25c60a4b7242a484
tree264f71eead3dab93aa3d6a93b0c70dcb78cda19e
parent67ab73af3ea301a01f83ea279b16f1da34ea6152
parente21bc6492cac94adafc0f4d402946ac6b314ccd0
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-07-14-13-42-39

Conflicts:
CRM/Contact/BAO/Contact.php
CRM/Contact/BAO/Contact/Utils.php
CRM/Contact/BAO/Contact.php
CRM/Contact/Selector.php
tests/phpunit/CiviTest/CiviUnitTestCase.php
tests/phpunit/api/v3/MembershipTest.php