Merge branch 'master' into next
commit7d1e8fef7ffce7fe8e9fa8fae99aaa15468fb6d3
authorJunio C Hamano <gitster@pobox.com>
Wed, 12 May 2010 06:04:57 +0000 (11 23:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 May 2010 06:04:57 +0000 (11 23:04 -0700)
treed80992d1c160dab4859899d36fcb9a3fe4f09781
parentfcae76096d9599cd09702240f3145cc392d5fe9c
parent0e4607c09d72ada4942ea49298dba83ec4145892
Merge branch 'master' into next

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