From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 8 Feb 2010 15:57:37 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.2.2~29^2^2~10
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2a9edd03057287cf7d69e5021eda2e0122684c92;p=git.git

Merge branch 'maint'

* maint:
  git-gui: check whether systems nice command works or disable it
---

2a9edd03057287cf7d69e5021eda2e0122684c92