From: Dave Greenberg <dave@civicrm.org>
Date: Wed, 28 Oct 2015 23:53:27 +0000 (-0700)
Subject: Merge pull request #7070 from davecivicrm/CRM-17425
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=12006cb588dfd9352ff6f532cf880e00a5316a6e;p=civicrm-core.git

Merge pull request #7070 from davecivicrm/CRM-17425

Crm 17425
---

12006cb588dfd9352ff6f532cf880e00a5316a6e