From: Monish Deb <monish.deb@webaccessglobal.com>
Date: Sun, 9 Aug 2015 10:38:16 +0000 (+0530)
Subject: Merge pull request #6449 from monishdeb/master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2ae9cb5c70181797e11b71831e0c725aaf4e00f9;p=civicrm-core.git

Merge pull request #6449 from monishdeb/master

Resolved merge conflict on CustomQuery file
---

2ae9cb5c70181797e11b71831e0c725aaf4e00f9