Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 12 May 2010 06:04:47 +0000 (23:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 May 2010 06:04:47 +0000 (23:04 -0700)
commit0e4607c09d72ada4942ea49298dba83ec4145892
tree4041afba9e0fd56d4061582c7fcdb5af98037495
parentd92f84461033b6ca3e19e31d30e5524bd25346ee
parent3368edd4cda6306d524e10758e2c5a187dcd4ba6
Merge branch 'maint'

* maint:
  GIT-VERSION-GEN: restrict tags used
GIT-VERSION-GEN