From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Tue, 27 Oct 2015 22:27:11 +0000 (+1300)
Subject: Merge pull request #7058 from eileenmcnaughton/merge-test
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e0f7db08c6f9ad45fc861ea09b6865572d7f10a2;p=civicrm-core.git

Merge pull request #7058 from eileenmcnaughton/merge-test

Add test for contact.merge action
---

e0f7db08c6f9ad45fc861ea09b6865572d7f10a2