Merge branch 'master' of ssh://kabarakh.de/var/git/other/kaba_gallery
Merge branch 'master' of ssh://kabarakh.de/var/git/other/kaba_gallery