Merge git://repo.or.cz/git-gui

* git://repo.or.cz/git-gui:
  git-gui: Delete branches with 'git branch -D' to clear config
  git-gui: Setup branch.remote,merge for shorthand git-pull
  git-gui: Update German translation
  git-gui: Don't use '$$cr master' with aspell earlier than 0.60
  git-gui: Report less precise object estimates for database compression

diff --cc git-gui/git-gui.sh
Simple merge

diff --cc git-gui/lib/branch_create.tcl
Simple merge

diff --cc git-gui/lib/branch_delete.tcl
Simple merge

diff --cc git-gui/lib/checkout_op.tcl
Simple merge

diff --cc git-gui/lib/database.tcl
Simple merge

diff --cc git-gui/lib/spellcheck.tcl
Simple merge

diff --cc git-gui/po/de.po
Simple merge