From: colemanw <coleman@civicrm.org>
Date: Tue, 26 Nov 2013 23:59:23 +0000 (-0800)
Subject: Merge pull request #2102 from eileenmcnaughton/CRM-13744
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=162e97471c8eed5cbae5c53de7decd7706ae3fc3;p=civicrm-core.git

Merge pull request #2102 from eileenmcnaughton/CRM-13744

CRM-13744 permissions allow 'or' permissions - prevents regression on ev...
---

162e97471c8eed5cbae5c53de7decd7706ae3fc3