Merge branch 'maint'
authorJunio C Hamano <redacted>
Tue, 24 Aug 2010 18:02:04 +0000 (11:02 -0700)
committerJunio C Hamano <redacted>
Tue, 24 Aug 2010 18:02:04 +0000 (11:02 -0700)
* maint:
  parse-options: clarify PARSE_OPT_NOARG description
  t3302 (notes): Port to Solaris


Trivial merge
git clone https://git.99rst.org/PROJECT