tree 51b72d3c3cdcbaa3c8e59d72dcb23c64a0941627
parent d09178aeaa9c60d68989603291ec43158b7adc31
author Adrian Crum <adrianc@apache.org> 1365945393 +0000
committer Adrian Crum <adrianc@apache.org> 1365945393 +0000

Merged revisions 1463856 and 1464001 from the trunk. Those changes are required to get profiling results to match with the trunk (we need the ability to turn off logging).


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/2013_RemoveJavolution@1467774 13f79535-47bb-0310-9956-ffa450edef68