Merge branch 'master' into next
commitab23886e0ca98e09f84abd606fb8191b56c0bc33
authorJunio C Hamano <gitster@pobox.com>
Sun, 6 Sep 2009 07:53:04 +0000 (6 00:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 6 Sep 2009 07:53:04 +0000 (6 00:53 -0700)
tree276825701740d1ae207f2d14283e63063e1fed8e
parentd597fbac9a9a87ce988151f761668fc2510aa217
parent6ea71fe7d36cf5b81c2100d97a822ecf0bc04746
Merge branch 'master' into next

* master:
  push: re-flow non-fast-forward message
  push: fix english in non-fast-forward message
  Do not scramble password read from .cvspass