Merge pull request #9376 from davejenx/CRM-19431
authorcolemanw <coleman@civicrm.org>
Fri, 11 Nov 2016 21:32:50 +0000 (16:32 -0500)
committerGitHub <noreply@github.com>
Fri, 11 Nov 2016 21:32:50 +0000 (16:32 -0500)
CRM-19431: avoid pollution (in EntityTag) and use (in ContactType) of…


Trivial merge