From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 11 Jun 2007 23:06:15 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.3-rc0~44^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aa751960178af04673f88adca4988f94ffd7f2dc;p=git.git

Merge branch 'maint'

* maint:
  git-gui: Include 'war on whitespace' fixes from git.git
---

aa751960178af04673f88adca4988f94ffd7f2dc