Merge branch 'master' into next
commitdd15ebc7753818de46ae10c6ebdffcc2fdc1a61c
authorJunio C Hamano <gitster@pobox.com>
Sun, 24 May 2009 22:30:47 +0000 (24 15:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 24 May 2009 22:30:47 +0000 (24 15:30 -0700)
tree44845a568031e78e9f29ff7c4835d46970ca593a
parentf0011c27a754d9898c4db2678e430d2995417ad0
parent9619ff14159ab3401636b9883a715b0f20b051df
Merge branch 'master' into next

* master:
  http-push.c::remove_locks(): fix use after free
  t/t3400-rebase.sh: add more tests to help migrating git-rebase.sh to C
  post-receive-email: hooks.showrev: show how to include both web link and patch