Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-30-12-58-23
authorTim Otten <totten@civicrm.org>
Wed, 30 Apr 2014 20:03:48 +0000 (13:03 -0700)
committerTim Otten <totten@civicrm.org>
Wed, 30 Apr 2014 20:03:48 +0000 (13:03 -0700)
commit2c53a8f729f160b603efc6e8f5eb03c118df6ed3
tree43bd832bdabd4e13f5816224fec58c0b2fa1db2d
parenta872180844222ded3553df15429ba03c574086f0
parent02c00ddaf7e444871e665070b2015515513f09fe
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-30-12-58-23

Conflicts:
CRM/Admin/Form/RelationshipType.php
CRM/Admin/Form/RelationshipType.php
CRM/Contact/BAO/Contact.php
CRM/Core/xml/Menu/Contact.xml
CRM/Event/Cart/Form/Checkout/Payment.php
CRM/Upgrade/Incremental/php/FourFour.php
CRM/Utils/System.php