Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Aug 2013 22:49:55 +0000 (15:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Aug 2013 22:49:55 +0000 (15:49 -0700)
commit96cb27a9d2db3c01b8e296a0fbc1da1da09d1412
treebd1025351e85a9d5f2d7776ada9404051d657475
parentb48493e937bb46d352336e2918e37120fe1d352d
parenta3bc3d070cacf07dbe11b4bfec57554c8bbf1957
Merge branch 'maint'

* maint:
  parse-options: fix clang opterror() -Wunused-value warning
parse-options.h