Merge pull request #8580 from JMAConsulting/CRM-16189-23
authorcolemanw <coleman@civicrm.org>
Mon, 4 Jul 2016 16:30:04 +0000 (12:30 -0400)
committerGitHub <noreply@github.com>
Mon, 4 Jul 2016 16:30:04 +0000 (12:30 -0400)
[ready-for-core-team-review]--CRM-16189, generalized code, removed hardcoded values, used function


Trivial merge