Merge branch 'maint'
commitefa646213a7d65955fbf897f57139ec3737d62f8
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 Aug 2012 20:13:53 +0000 (24 13:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Aug 2012 20:13:53 +0000 (24 13:13 -0700)
tree49a6086eaa08e43de8932f6a1be54f402e82aec8
parent851f7e689efa034701bf41c3be06c927480eaae9
parent871e293c9acbeaacce59dcd98fab6028f552f5be
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.