Merge branch 'dk/version-gen-gitdir' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 05:51:41 +0000 (22:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 05:51:41 +0000 (22:51 -0700)
* dk/version-gen-gitdir:
  GIT-VERSION-GEN: support non-standard $GIT_DIR path

1  2 
GIT-VERSION-GEN

diff --cc GIT-VERSION-GEN
Simple merge