Merge branch 'maint-1.7.11' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Aug 2012 18:27:30 +0000 (11:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
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