From: Kurund Jalmi <kurund@civicrm.org>
Date: Wed, 15 Apr 2015 00:57:41 +0000 (-0700)
Subject: Merge pull request #5633 from kurund/CRM-15959
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4eb56927c7de69f7f86796c5ce1286dbd1ee3a42;p=civicrm-core.git

Merge pull request #5633 from kurund/CRM-15959

CRM-15959, manually applied changes that were lost in forward merge
---

4eb56927c7de69f7f86796c5ce1286dbd1ee3a42