Merge branch 'maint' of https://github.com/ralfth/git-po-de into maint