Merge branch 'master' of ssh://source/srv/source.djpig.de/git/packages