Merge branch '4.4' into master
authorColeman Watts <coleman@civicrm.org>
Sat, 3 May 2014 22:03:11 +0000 (15:03 -0700)
committerColeman Watts <coleman@civicrm.org>
Sat, 3 May 2014 22:03:11 +0000 (15:03 -0700)
commite425a965789b9e5a86069069c8fa18c50d3e2b6a
tree1a730d1f4adcc80bc126561f8959f13ab6c8a294
parent8126c102e9b94f664cc60ace41c9238c59197f49
parentb91f3fe463a55fef2c1a8983de118c0f01a77b7f
Merge branch '4.4' into master

Conflicts:
templates/CRM/Contact/Form/OnBehalfOf.tpl
templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
CRM/Contact/BAO/Contact/Utils.php
CRM/Contact/Form/RelatedContact.php
CRM/Contribute/Form/Contribution/OnBehalfOf.php
CRM/Contribute/Form/ContributionBase.php
CRM/Contribute/xml/Menu/Contribute.xml
CRM/Core/I18n.php
CRM/Core/Page/AJAX/Location.php
CRM/Report/Form/Pledge/Pbnp.php
templates/CRM/Contact/Form/OnBehalfOf.tpl
templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl