Merge branch 'jk/rebase-config-insn-fmt-docfix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 29 Nov 2016 21:27:58 +0000 (13:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Nov 2016 21:27:58 +0000 (13:27 -0800)
Documentation fix.

* jk/rebase-config-insn-fmt-docfix:
doc: fix missing "::" in config list

1  2 
Documentation/config.txt
Simple merge