Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-07-16-12-52-48
authorkurund <kurund@civicrm.org>
Wed, 16 Jul 2014 07:38:50 +0000 (13:08 +0530)
committerkurund <kurund@civicrm.org>
Wed, 16 Jul 2014 07:38:50 +0000 (13:08 +0530)
commitf2a84e5c7c916f6c0d4c7fce69b844b019c17dd1
tree94b65d5086b2c0becbd30ea856e1feacbf7d1eea
parentb5b50c79af2f73b815d4524a14e8c97cbc8c861a
parentd925ca9a0c17908b9ce8606ce3b9f722b99698c3
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-07-16-12-52-48

Conflicts:
CRM/Contact/Form/Contact.php
CRM/Profile/Form.php
CRM/Upgrade/Incremental/php/FourFour.php
CRM/Utils/String.php
12 files changed:
CRM/Contact/BAO/Contact.php
CRM/Contact/Form/Contact.php
CRM/Contact/Page/View.php
CRM/Contribute/BAO/ContributionRecur.php
CRM/Core/BAO/UFGroup.php
CRM/Profile/Form.php
CRM/Report/Form/Contribute/Detail.php
CRM/Upgrade/Form.php
CRM/Upgrade/Incremental/php/FourFour.php
CRM/Utils/Date.php
CRM/Utils/String.php
CRM/Utils/System/Drupal.php