Merge branch 'master' of ssh://mangobrain@repo.or.cz/srv/git/cteddy