Merge pull request #7073 from eileenmcnaughton/CRM-17464-master
authorEileen McNaughton <eileen@mcnaughty.com>
Thu, 12 Nov 2015 14:36:32 +0000 (06:36 -0800)
committerEileen McNaughton <eileen@mcnaughty.com>
Thu, 12 Nov 2015 14:36:32 +0000 (06:36 -0800)
CRM-17464 remove deadlock inducing query

1  2 
CRM/Contact/BAO/Contact.php

Simple merge