Merge branch 'maint-1.6.0' into maint-1.6.1
authorJunio C Hamano <gitster@pobox.com>
Sun, 14 Jun 2009 00:09:45 +0000 (17:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Jun 2009 00:09:45 +0000 (17:09 -0700)
* maint-1.6.0:
  git-rerere.txt: grammatical fixups and cleanups
  http-push.c::remove_locks(): fix use after free

1  2 
http-push.c

diff --cc http-push.c
Simple merge