Merge branch 'master' into next
commitba590acfe07112ef4a91cda49a375b358bbc945a
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Nov 2010 02:02:45 +0000 (29 18:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Nov 2010 02:02:45 +0000 (29 18:02 -0800)
tree218bfe337cf465a570bbd86bd0ede1728f8a22b7
parent03864edeab230c99aac705ab795ed9e8b63cc7d3
parent208247adb9fc3702f87c6ec3fc26bd85d10d73e6
Merge branch 'master' into next

* master:
  t7300: add a missing SYMLINKS prerequisite