older versions of git have no --short for symbolic-ref
__git_prompt: ignore stderr. if .git is a bare repository this would generate errors otherwise
Merge branch 'master' of https://github.com/voku/dotfiles

* 'master' of https://github.com/voku/dotfiles:
  update "phpserver()"