Merge branch 'maint'

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

Junio C Hamano committed Aug 9, 2013 at 15:49 UTC 96cb27a9d2db3c01b8e296a0fbc1da1da09d1412

No changes.