Merge pull request #7775 from routinet/CRM17995
authorTim Otten <totten@civicrm.org>
Tue, 9 Feb 2016 20:22:22 +0000 (12:22 -0800)
committerTim Otten <totten@civicrm.org>
Tue, 9 Feb 2016 20:22:22 +0000 (12:22 -0800)
commitfc96a57294641c1650e7e306482032a710c68c96
tree8a4447c341b053d1aa5135dc4bf82a9a2d089622
parentc5906cd389825b4f2fc5ad50d2c7b67eb581f813
parent336ca64cf147daa56ab5b0c3596ba61650740d08
Merge pull request #7775 from routinet/CRM17995

Revert portion of CRM17748