Code

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)
commitdfe50511c7e5ec2bc771c9a5f4c3318332a7744e
tree1666306983a1943e1f7b2988ab29cef18a9492a3
parent58066bec5a2cd8f5b6bb4884c8162364374ba0c1
parentc97038d1cfbd98ea258086c417fe4f0c094596d3
Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
  git-rerere.txt: grammatical fixups and cleanups
  http-push.c::remove_locks(): fix use after free
http-push.c