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

* git://repo.or.cz/git-gui:
  git-gui: Correct encoding of glossary/fr.po to UTF-8
  git-gui: Consolidate hook execution code into a single function
  git-gui: Correct window title for hook failure dialogs
  git-gui: Honor the standard commit-msg hook

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

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

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

diff --cc git-gui/po/glossary/fr.po
Simple merge