From: Shawn O. Pearce <spearce@spearce.org>
Date: Thu, 24 Apr 2008 01:38:30 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.6-rc0~52^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ca19404876451ea8be0cc5b3ed561344b5fc80c5;p=git.git

Merge branch 'maint'

* maint:
  git-gui: Don't use '$$cr master' with aspell earlier than 0.60
---

ca19404876451ea8be0cc5b3ed561344b5fc80c5