Merge pull request #7058 from eileenmcnaughton/merge-test
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 27 Oct 2015 22:27:11 +0000 (11:27 +1300)
committerEileen McNaughton <eileen@mcnaughty.com>
Tue, 27 Oct 2015 22:27:11 +0000 (11:27 +1300)
Add test for contact.merge action


Trivial merge