From: Russ Cox <rsc@golang.org>
Date: Wed, 17 Feb 2016 18:45:03 +0000 (-0500)
Subject: all: merge master into release-branch.go1.6
X-Git-Tag: go1.6~1
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=6e3041b92767ff38a993a265ef2daec64b3f7f11;p=gostls13.git

all: merge master into release-branch.go1.6

Change-Id: Ie2a999e36ee654c1217bd03f720791360f66718d
---

6e3041b92767ff38a993a265ef2daec64b3f7f11
diff --cc misc/nacl/testzip.proto
index c8ab18ea20,dcb156350a..4e82ac9b4b
--- a/misc/nacl/testzip.proto
+++ b/misc/nacl/testzip.proto
@@@ -32,18 -44,9 +44,6 @@@ go	src=.
  				gofmt_test.go
  				testdata
  					+
- 			vendor
- 				golang.org
- 						x
- 							arch
- 								arm
- 									armasm
- 										testdata
- 												+
- 								x86
- 									x86asm
- 										testdata
- 												+
 -			newlink
 -				testdata
 -					+
  		archive
  			tar
  				testdata