Merge branch 'master' of http://wagnertech.de/git/projects