Merge branch 'master' of ssh://git.camperquake.de:22003/quotesite