Merge branch 'master' of ssh://Culex@repo.or.cz/srv/git/gitman-de