Merge branch 'maint-1.7.11' into maint
authorJunio C Hamano <redacted>
Wed, 22 Aug 2012 18:27:30 +0000 (11:27 -0700)
committerJunio C Hamano <redacted>
Wed, 22 Aug 2012 18:27:30 +0000 (11:27 -0700)
* maint-1.7.11:
  contrib/ciabot: Get ciabot configuration from git variables


Trivial merge
git clone https://git.99rst.org/PROJECT