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