Merge pull request #8610 from cividesk/CRM-18987-4.6
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 29 Jun 2016 03:18:54 +0000 (15:18 +1200)
committerGitHub <noreply@github.com>
Wed, 29 Jun 2016 03:18:54 +0000 (15:18 +1200)
CRM-1897: full fix


Trivial merge