Merge branch 'master' of git+ssh://dmaphy@repo/srv/git/vomak