Merge pull request #6825 from jitendrapurohit/CRM-17169reg
authorMonish Deb <monish.deb@webaccessglobal.com>
Mon, 28 Sep 2015 17:55:59 +0000 (23:25 +0530)
committerMonish Deb <monish.deb@webaccessglobal.com>
Mon, 28 Sep 2015 17:55:59 +0000 (23:25 +0530)
commit78c00c4a0587f75af7f1406071fa60b59c0b2e79
treef811fa9feb8dec5442f0ea3e17b641e875614a95
parenteb5a910f59709e54df3b7c10a3c2fdc98ee9d45c
parentbe4d57936b559181826e360ddd710efe107673e9
Merge pull request #6825 from jitendrapurohit/CRM-17169reg

CRM-17169 -- Fix upgrade conflict