From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 24 Aug 2012 20:13:53 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.8.0-rc0~136
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=efa646213a7d65955fbf897f57139ec3737d62f8;p=git.git

Merge branch 'maint'

* maint:
  Prepare for 1.7.11.6
  Make the ciabot scripts completely self-configuring in the normal case.
  Improved documentation for the ciabot scripts.
---

efa646213a7d65955fbf897f57139ec3737d62f8