Merge branch 'master' of NalaGinrut@repo.or.cz:srv/git/NalaBridge