Merge pull request #5633 from kurund/CRM-15959
authorKurund Jalmi <kurund@civicrm.org>
Wed, 15 Apr 2015 00:57:41 +0000 (17:57 -0700)
committerKurund Jalmi <kurund@civicrm.org>
Wed, 15 Apr 2015 00:57:41 +0000 (17:57 -0700)
CRM-15959, manually applied changes that were lost in forward merge


Trivial merge