Merge branch 'maint'
commit7f6a0719dae5f87e85a68142eb0c99b9c8a32c44
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Aug 2012 18:53:58 +0000 (22 11:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Aug 2012 18:53:58 +0000 (22 11:53 -0700)
tree8d8d7feea71bd854b373fed0376f403f04bbdf9f
parentac26684984c71d10c274224aea60bcf70ec45706
parentfab4b04e4be5ccfdf93e21e7260040bd9e7faedd
Merge branch 'maint'

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