From: Heather Killam <heather.killam.kw@gmail.com>
Date: Mon, 6 Jun 2016 22:50:31 +0000 (-0400)
Subject: Merge pull request #2 from hkillam/patch-3
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=edae96fdce5724009f88d5c1ac4001e29e82fcfe;p=civicrm-core.git

Merge pull request #2 from hkillam/patch-3

Merge two patches into single patch.
---

edae96fdce5724009f88d5c1ac4001e29e82fcfe