From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Aug 2012 18:27:30 +0000 (-0700)
Subject: Merge branch 'maint-1.7.11' into maint
X-Git-Tag: v1.7.12.1~30
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fab4b04e4be5ccfdf93e21e7260040bd9e7faedd;p=git.git

Merge branch 'maint-1.7.11' into maint

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

fab4b04e4be5ccfdf93e21e7260040bd9e7faedd