Merge branch 'maint-1.6.1' into maint-1.6.2
commit34ab57df974ad74cc93550bfac2f90d203837a17
authorJunio C Hamano <gitster@pobox.com>
Sun, 24 May 2009 22:29:23 +0000 (24 15:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 24 May 2009 22:29:23 +0000 (24 15:29 -0700)
tree84da5c50e569edd9791fff35fcdc7e33a82cd504
parent213195185c8aa09d6192b85a3f78bf46f19f51a4
parentff6e93fe605b748055267fd325c760d0f32dcf92
Merge branch 'maint-1.6.1' into maint-1.6.2

* maint-1.6.1:
  http-push.c::remove_locks(): fix use after free
http-push.c