tree dd3c8ad2a3574c15f22cede74ea68463a92f5ff8
parent 4f8303905eafaa04fd08a20a08a81436aea2d4b9
parent cdb791f61d71db24fa54363ff6d4b42a46ebbdf1
author Junio C Hamano <gitster@pobox.com> 1308933602 -0700
committer Junio C Hamano <gitster@pobox.com> 1308933602 -0700

Merge branch 'maint-1.7.4' into maint

* maint-1.7.4:
  completion: replace core.abbrevguard to core.abbrev