Merge branch 'master' of github.com:ruester/git-po-de