Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-17-17-47-49
authorTim Otten <totten@civicrm.org>
Thu, 17 Oct 2013 12:26:41 +0000 (17:56 +0530)
committerTim Otten <totten@civicrm.org>
Thu, 17 Oct 2013 12:26:41 +0000 (17:56 +0530)
commit606c258cf52633eb50d9aeef97fde5782f1fa524
treef4d5d9ec50b737650224eb176a45978c8a434ec5
parent640d746612fb98a1876ae084e4d4037c8e732e4a
parent975cb25ce487df99cd85007450403af12b4f8ccc
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-17-17-47-49

Conflicts:
CRM/Contact/BAO/Individual.php
sql/civicrm_generated.mysql
CRM/Contact/BAO/Individual.php
CRM/Contact/BAO/Query.php
CRM/Dedupe/Merger.php
CRM/Event/BAO/Event.php
sql/civicrm_generated.mysql
xml/templates/civicrm_data.tpl