From: Chris Broadfoot <cbro@golang.org>
Date: Wed, 3 Feb 2016 22:11:49 +0000 (-0800)
Subject: all: merge master into release-branch.go1.6
X-Git-Tag: go1.6rc2~1
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=ce8d5ba53e1b0c4bc5b9708f06f7fd6318d73154;p=gostls13.git

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

Change-Id: Ifbe63b764e3d6933b112a4307a3701a047227976
---

ce8d5ba53e1b0c4bc5b9708f06f7fd6318d73154