Merge branch 'jk/coding-guidelines-update' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:32:11 +0000 (13:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:32:11 +0000 (13:32 -0800)
Developer doc update.

* jk/coding-guidelines-update:
CodingGuidelines: clarify multi-line brace style

Trivial merge