Merge branch 'master' of ssh://luonnotar/var/git/misc/hallinta-vmail