Merge git://github.com/ralfth/git-po-de