From: Monish Deb <monish.deb@webaccessglobal.com>
Date: Mon, 22 Jun 2015 05:05:38 +0000 (+0530)
Subject: Merge pull request #5898 from monishdeb/master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=74af3ad41782bd30ac9231eb190f0fa1c4300c47;p=civicrm-core.git

Merge pull request #5898 from monishdeb/master

Merge conflict fix
---

74af3ad41782bd30ac9231eb190f0fa1c4300c47