typo
Merge branch 'master' of git.uibk:/home/git/rewriting