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.

Junio C Hamano committed Aug 24, 2012 at 13:13 UTC efa646213a7d65955fbf897f57139ec3737d62f8

No changes.