From: Tim Otten <totten@civicrm.org>
Date: Wed, 4 May 2016 18:30:37 +0000 (-0700)
Subject: Merge pull request #8265 from mollux/CRM-17983-v2
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ff0d071b569d0dd7018862e3461ee6d7830e37a8;hp=f11b68e095eb55e5125a3cf32f7f3c23ef599265;p=civicrm-core.git

Merge pull request #8265 from mollux/CRM-17983-v2

CRM-17983
---