Merge branch 'master' of ssh://vps.jankratochvil.net/var/lib/git/nethome