From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Aug 2012 18:53:58 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.8.0-rc0~138
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7f6a0719dae5f87e85a68142eb0c99b9c8a32c44?hp=--cc

Merge branch 'maint'

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

7f6a0719dae5f87e85a68142eb0c99b9c8a32c44