Merge branch 'maint'
commitca19404876451ea8be0cc5b3ed561344b5fc80c5
authorShawn O. Pearce <spearce@spearce.org>
Thu, 24 Apr 2008 01:38:30 +0000 (23 21:38 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Thu, 24 Apr 2008 01:38:30 +0000 (23 21:38 -0400)
tree10d36475d64ae8d7077cd4f12bfd2bcac2f167c3
parentdd70f3dbe48b9e30589c5832e95229b474651d6a
parentddc360314544a21638fd0658218bbc37aafedd6f
Merge branch 'maint'

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