Steve Riesenberg 9db33f33c7 Revert unnecessary merges on 6.0.x 1 gadu atpakaļ
..
java 9db33f33c7 Revert unnecessary merges on 6.0.x 1 gadu atpakaļ
resources e16b8e7976 Fix logback-test.xml 8 gadi atpakaļ