Merge pull request #8916 from cividesk/CRM-19256-4.7

author colemanw <coleman@civicrm.org>

Thu, 12 Jan 2017 20:11:03 +0000 (15:11 -0500)

committer GitHub <noreply@github.com>

Thu, 12 Jan 2017 20:11:03 +0000 (15:11 -0500)
author colemanw <coleman@civicrm.org>
Thu, 12 Jan 2017 20:11:03 +0000 (15:11 -0500)
committer GitHub <noreply@github.com>
Thu, 12 Jan 2017 20:11:03 +0000 (15:11 -0500)
diff --cc CRM/Core/Permission.php
Simple merge
diff --cc CRM/Utils/Hook.php
Simple merge
author	colemanw <coleman@civicrm.org>
	Thu, 12 Jan 2017 20:11:03 +0000 (15:11 -0500)
committer	GitHub <noreply@github.com>
	Thu, 12 Jan 2017 20:11:03 +0000 (15:11 -0500)
		1	2
CRM/Core/Permission.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Utils/Hook.php	patch \|	diff1 \|	diff2 \|	blob \| history