From: Dave Greenberg <dave@civicrm.org>
Date: Wed, 10 Jun 2015 20:30:47 +0000 (-0700)
Subject: Merge pull request #5980 from marcov4lente/CRM-15829+CRM15881-for-4.6
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=54c872d812de4d61bb1f7e775bdfd32460583bba;p=civicrm-core.git

Merge pull request #5980 from marcov4lente/CRM-15829+CRM15881-for-4.6

CRM-15829 and CRM-15881 for 4.6
---

54c872d812de4d61bb1f7e775bdfd32460583bba