Merge branch 'master' of ssh://git.ccc-ffm.de/memberdb