Merge branch 'maint-1.7.11' into maint
commitfab4b04e4be5ccfdf93e21e7260040bd9e7faedd
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Aug 2012 18:27:30 +0000 (22 11:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Aug 2012 18:27:30 +0000 (22 11:27 -0700)
tree495a88ddf4f4a7782c29915adcdf1caf8daae9b3
parent889d35899ba64640e47798681ecb34a4be043bad
parentc142616fb2152d7887f9c38ff20e07167d31b0c8
Merge branch 'maint-1.7.11' into maint

* maint-1.7.11:
  contrib/ciabot: Get ciabot configuration from git variables