Merge pull request #5980 from marcov4lente/CRM-15829+CRM15881-for-4.6
authorDave Greenberg <dave@civicrm.org>
Wed, 10 Jun 2015 20:30:47 +0000 (13:30 -0700)
committerDave Greenberg <dave@civicrm.org>
Wed, 10 Jun 2015 20:30:47 +0000 (13:30 -0700)
commit54c872d812de4d61bb1f7e775bdfd32460583bba
treeb1e0fd179250cde79060b1aee6e60a2241dec326
parentdc86ea6f7040b798217af5ba09fac54373adaf87
parent3421dcee5a6f8d01da9aba73a7365d04e8c98838
Merge pull request #5980 from marcov4lente/CRM-15829+CRM15881-for-4.6

CRM-15829 and CRM-15881 for 4.6