From: Dave Greenberg <dave@civicrm.org>
Date: Fri, 13 Mar 2015 22:08:26 +0000 (-0700)
Subject: Merge pull request #5384 from davecivicrm/CRM-16108
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fcd7397daa4bf0d078a5590a0b5d9c3adf5f655a;p=civicrm-core.git

Merge pull request #5384 from davecivicrm/CRM-16108

CRM-16108 - Backport to 4.6.
---

fcd7397daa4bf0d078a5590a0b5d9c3adf5f655a