Merge pull request #8735 from eileenmcnaughton/address_tests
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 16 Aug 2016 08:34:33 +0000 (20:34 +1200)
committerGitHub <noreply@github.com>
Tue, 16 Aug 2016 08:34:33 +0000 (20:34 +1200)
CRM-19074 & CRM-19113 merge fixes & tests

1  2 
CRM/Contact/BAO/Contact.php

Simple merge