Merge branch 'master' into next
commitc303c1b3242eaacf3f3c56ba3a93a3eba1aeb693
authorJunio C Hamano <gitster@pobox.com>
Sun, 4 Apr 2010 17:23:33 +0000 (4 10:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 Apr 2010 17:23:33 +0000 (4 10:23 -0700)
treee51d4f167f376a28c6a422a2f793368a747c5f95
parent78fb255076efbc4d9d71026dc0b3bc5b7be24691
parent11766ca4a89ba960271e94281463d1b44654ca3b
Merge branch 'master' into next

* master:
  pack-protocol.txt: fix pkt-line lengths
  pack-protocol.txt: fix spelling
  Makefile: future-proof Cygwin version check
Makefile