Merge pull request #8380 from mollux/CRM-18563_or_permission_api_exception
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 21 Jun 2016 20:51:34 +0000 (08:51 +1200)
committerGitHub <noreply@github.com>
Tue, 21 Jun 2016 20:51:34 +0000 (08:51 +1200)
CRM-18563 API or permissions


Trivial merge