Merge branch 'ef/http-o-depends-on-gvf' into maint
commit0626fae6afc9c6976aead4237691fb3568dd5c68
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Jun 2012 20:22:44 +0000 (1 13:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Jun 2012 20:22:44 +0000 (1 13:22 -0700)
tree6cc17fca3e1c92c4559ace4f374f5173707ac621
parent2147cb2762c67d0ec2101ab13a4c1b0ef8cab599
parent38475f972ce1cadf309982420a09bfc9c610a14a
Merge branch 'ef/http-o-depends-on-gvf' into maint

A minor compilation fix.

By Erik Faye-Lund
* ef/http-o-depends-on-gvf:
  Makefile: add missing GIT-VERSION-FILE dependency
Makefile