Merge branch 'master' of git://git.dolda2000.com/doldaconnect