Merge branch 'maint-1.7.4' into maint

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

Junio C Hamano committed Jun 24, 2011 at 09:40 UTC 99ac63b092f592b7181f94b6479f3a24dbfc8fdb

No changes.