Steve Riesenberg 447f40949c Revert unnecessary merges on 6.1.x 1 rok pred
..
main 447f40949c Revert unnecessary merges on 6.1.x 1 rok pred
site cb4f3d2f44 Use UTF-8 for Java sources and XML 6 rokov pred
test 447f40949c Revert unnecessary merges on 6.1.x 1 rok pred