Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Aug 2012 18:53:58 +0000 (11:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Aug 2012 18:53:58 +0000 (11:53 -0700)
* maint:
  contrib/ciabot: Get ciabot configuration from git variables


Trivial merge