From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Aug 2010 18:02:04 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.3-rc0~42
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b5442ca101c2d2b6eacaf3428505e5006f2218ae;p=git.git

Merge branch 'maint'

* maint:
  parse-options: clarify PARSE_OPT_NOARG description
  t3302 (notes): Port to Solaris
---

b5442ca101c2d2b6eacaf3428505e5006f2218ae