Merge pull request #6355 from jitendrapurohit/CRM-16915addfixes
authorKurund Jalmi <kurund@civicrm.org>
Thu, 30 Jul 2015 13:48:37 +0000 (19:18 +0530)
committerKurund Jalmi <kurund@civicrm.org>
Thu, 30 Jul 2015 13:48:37 +0000 (19:18 +0530)
Additional fixes for CRM-16915


Trivial merge