Merge branch 'maint'

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

Junio C Hamano committed Aug 22, 2012 at 11:53 UTC 7f6a0719dae5f87e85a68142eb0c99b9c8a32c44

No changes.