Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-07-07-15-48-59
authorkurund <kurund@civicrm.org>
Mon, 7 Jul 2014 10:24:13 +0000 (15:54 +0530)
committerkurund <kurund@civicrm.org>
Mon, 7 Jul 2014 10:24:13 +0000 (15:54 +0530)
commit58a50b22e20f112fdbfc7e50f18353c311ceb1ae
treee4aa591949b84e9b15d78afe2b7c9c51b57b3f32
parent88ae04042748f758b13f18bc8639301962afcec1
parent551352f68a32dadef4a32341dca6aa1a2f3929ed
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-07-07-15-48-59

Conflicts:
CRM/Dedupe/Merger.php
sql/civicrm_generated.mysql
xml/version.xml
CRM/Contact/Import/Form/MapField.php
CRM/Contact/Import/Parser/Contact.php
CRM/Contribute/Form/Contribution/OnBehalfOf.php
CRM/Core/BAO/CustomField.php
CRM/Core/BAO/CustomGroup.php
CRM/Core/Page/AJAX/Location.php
CRM/Dedupe/Merger.php
CRM/Utils/DeprecatedUtils.php
templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl