Merge pull request #7888 from totten/master-api-key
authorTim Otten <totten@civicrm.org>
Mon, 29 Feb 2016 20:44:33 +0000 (12:44 -0800)
committerTim Otten <totten@civicrm.org>
Mon, 29 Feb 2016 20:44:33 +0000 (12:44 -0800)
CRM-18112 - Additional permission for editing "api_key"


Trivial merge