Merge pull request #8695 from eileenmcnaughton/address_tests
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 20 Jul 2016 11:40:21 +0000 (23:40 +1200)
committerGitHub <noreply@github.com>
Wed, 20 Jul 2016 11:40:21 +0000 (23:40 +1200)
commitd7955ebd533d1043b19a78399d5097c45db9d358
treebc2d40a1100b57a069b7667b005d3705055d585f
parenta1340ef9ba73f91935e5f7fae6d47d8171122547
parent5d5b49ad80c35d6be7f8af3fbd9a75e374c746f0
Merge pull request #8695 from eileenmcnaughton/address_tests

CRM-19076 Multiple Merge tests + fix for lost address