Merge pull request #8843 from eileenmcnaughton/merge_fixes
authorEileen McNaughton <eileen@mcnaughty.com>
Thu, 18 Aug 2016 21:56:01 +0000 (09:56 +1200)
committerGitHub <noreply@github.com>
Thu, 18 Aug 2016 21:56:01 +0000 (09:56 +1200)
CRM-19197 merge links fix and CRM-19198 Add form merge hook call

1  2 
CRM/Contact/Page/AJAX.php

Simple merge