Merge pull request #8397 from seamuslee001/CRM-18559
authorEileen McNaughton <eileen@mcnaughty.com>
Thu, 19 May 2016 01:22:37 +0000 (13:22 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Thu, 19 May 2016 01:22:37 +0000 (13:22 +1200)
CRM-18559 sync functions from master which seem to resolve this in th…


Trivial merge