From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Fri, 13 May 2016 10:13:14 +0000 (+1200)
Subject: Merge pull request #8249 from eileenmcnaughton/merge_code
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=af6b2380fbac6645952be28839153f287a681358;p=civicrm-core.git

Merge pull request #8249 from eileenmcnaughton/merge_code

Remove duplication of definition of cacheKeyString
---

af6b2380fbac6645952be28839153f287a681358