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

* git://repo.or.cz/git-gui:
  git-gui: adjust the minimum height of diff pane for shorter screen height
  git-gui: fix use of uninitialized variable
  git-gui: store wm state and fix wm geometry
  git-gui: Ensure submodule path is quoted properly
  git-gui: fix diff for partially staged submodule changes
  git-gui: Update russian translation
  git-gui: Limit display to a maximum number of files
  git-gui: remove warning when deleting correctly merged remote branch
  git-gui: Added Greek translation & glossary
  git-gui: display summary when showing diff of a submodule

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

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

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

diff --cc git-gui/po/el.po
index 0000000000000000000000000000000000000000,3634ba469da0be6e12f0cb82b8340727b438409c..3634ba469da0be6e12f0cb82b8340727b438409c
mode 000000,100644..100644
--- /dev/null
--- 2/po/el.po
+++ b/git-gui/po/el.po

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

diff --cc git-gui/po/glossary/el.po
index 0000000000000000000000000000000000000000,1d3cc818d5ef9eb144fd4ee16193223c9c159654..1d3cc818d5ef9eb144fd4ee16193223c9c159654
mode 000000,100644..100644
--- /dev/null
--- 2/po/glossary/el.po
+++ b/git-gui/po/glossary/el.po

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