Merge branch 'maint-1.7.11' into maint

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

Junio C Hamano committed Aug 22, 2012 at 11:27 UTC fab4b04e4be5ccfdf93e21e7260040bd9e7faedd

No changes.