Merge pull request #9029 from kcristiano/CRM-19279
authorTim Otten <totten@civicrm.org>
Wed, 14 Sep 2016 19:51:24 +0000 (12:51 -0700)
committerGitHub <noreply@github.com>
Wed, 14 Sep 2016 19:51:24 +0000 (12:51 -0700)
CRM-19729


Trivial merge