Merge pull request #9901 from kurund/CRM-20187
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 28 Feb 2017 04:23:06 +0000 (17:23 +1300)
committerGitHub <noreply@github.com>
Tue, 28 Feb 2017 04:23:06 +0000 (17:23 +1300)
fixes for CRM-20187


Trivial merge