Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 Aug 2012 20:13:53 +0000 (13:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Aug 2012 20:13:53 +0000 (13:13 -0700)
* maint:
Prepare for 1.7.11.6
Make the ciabot scripts completely self-configuring in the normal case.
Improved documentation for the ciabot scripts.

Trivial merge