Merge branch 'master' of git+ssh://w_i@repo.or.cz/srv/git/ajatus