From: Dave Greenberg <dave@civicrm.org>
Date: Wed, 16 Jul 2014 22:55:47 +0000 (-0700)
Subject: Merge pull request #3687 from GinkgoFJG/CRM-14990-2
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1be298ccc48d0afec4c7bb80d66c90020ed3473c;p=civicrm-core.git

Merge pull request #3687 from GinkgoFJG/CRM-14990-2

CRM-14990: Round two.
---

1be298ccc48d0afec4c7bb80d66c90020ed3473c