Merge branch 'maint'
commitb5442ca101c2d2b6eacaf3428505e5006f2218ae
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Aug 2010 18:02:04 +0000 (24 11:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Aug 2010 18:02:04 +0000 (24 11:02 -0700)
tree150e6d1da822cb496e0e7ee0b3d856a2c6de5dbe
parent25641fcdb0d31130fadd649861035cc7db859cf7
parentef45e4dae0a0f45fc72b7cd34b32dd465a38697d
Merge branch 'maint'

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