From: Shawn O. Pearce <spearce@spearce.org>
Date: Thu, 21 Feb 2008 05:21:54 +0000 (-0500)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.5-rc0~3^2~26
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f4d93486aea3a3c20ddef409e5bfd8a60efdc512;p=git.git

Merge branch 'maint'

* maint:
  git-gui: Ensure error dialogs always appear over all other windows
---

f4d93486aea3a3c20ddef409e5bfd8a60efdc512