Merge branch 'mg/doc-status-color-slot' into maint

Documentation fixes. * mg/doc-status-color-slot: config,completion: add color.status.unmerged

Junio C Hamano committed Mar 23, 2015 at 11:23 UTC ffac6258de4f72e06b6b2e412deffb00a1abb339

No changes.