From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 14 Jun 2009 00:09:45 +0000 (-0700)
Subject: Merge branch 'maint-1.6.0' into maint-1.6.1
X-Git-Tag: v1.6.3.3~6^2~2^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dfe50511c7e5ec2bc771c9a5f4c3318332a7744e;p=git.git

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
---

dfe50511c7e5ec2bc771c9a5f4c3318332a7744e