Merge branch 'sg/merge-summary-config' into maint

Doc updates. * sg/merge-summary-config: Documentation: include 'merge.branchdesc' for merge and config as well

Junio C Hamano committed Jun 25, 2015 at 11:02 UTC ebf4fc90da239f1005d2c5b1a4278cfe51430151

No changes.