Merge branch 'sb/parse-options-codeformat' into maint

* sb/parse-options-codeformat: parse-options: align curly braces for all options

Junio C Hamano committed Aug 19, 2015 at 14:41 UTC b994b9bc0b5e72da1158ad159c068cacaaef2eda

No changes.