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)
commit4eb56927c7de69f7f86796c5ce1286dbd1ee3a42
tree75aca73b10bafeb6367d6affa4cdadec10ebc570
parent8d5062688603e2263d91066c62244a630d27cbfa
parent25ce8d1359267894ed06b7ccbba405130bfe3021
Merge pull request #5633 from kurund/CRM-15959

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