Merge branch 'maint-1.6.0' into maint-1.6.1
commitff6e93fe605b748055267fd325c760d0f32dcf92
authorJunio C Hamano <gitster@pobox.com>
Sun, 24 May 2009 22:29:13 +0000 (24 15:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 24 May 2009 22:29:13 +0000 (24 15:29 -0700)
treecd70b871a9496c5502b975236aa4c900af04ab28
parent58066bec5a2cd8f5b6bb4884c8162364374ba0c1
parent6589ebf107214a9e6db31764e847301f1adebc81
Merge branch 'maint-1.6.0' into maint-1.6.1

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