From: Dave Greenberg <dave@civicrm.org>
Date: Tue, 30 Sep 2014 22:36:41 +0000 (-0700)
Subject: Merge pull request #4283 from davecivicrm/CRM-15380
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c96109a508b7b2c1d12f641fa2bf87e7274651cf;p=civicrm-core.git

Merge pull request #4283 from davecivicrm/CRM-15380

CRM-15380 - Replaces PR 4273.
---

c96109a508b7b2c1d12f641fa2bf87e7274651cf