Merge pull request #6449 from monishdeb/master
authorMonish Deb <monish.deb@webaccessglobal.com>
Sun, 9 Aug 2015 10:38:16 +0000 (16:08 +0530)
committerMonish Deb <monish.deb@webaccessglobal.com>
Sun, 9 Aug 2015 10:38:16 +0000 (16:08 +0530)
commit2ae9cb5c70181797e11b71831e0c725aaf4e00f9
treec8ea23d81fae008539cb5fa987f4c4ac8116ecd4
parentcf84f4309754f20dffb8e64a7d59a61a439da2b0
parent607a937647f001461d22b8ed3f1bac4372610630
Merge pull request #6449 from monishdeb/master

Resolved merge conflict on CustomQuery file