From: Russ Cox <rsc@golang.org>
Date: Fri, 20 Feb 2015 15:28:36 +0000 (-0500)
Subject: [dev.cc] all: merge master (5868ce3) into dev.cc
X-Git-Tag: go1.5beta1~1915^2~29
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b4a7806724b78f7c26326f6acee0dcca0110b7a8;p=gostls13.git

[dev.cc] all: merge master (5868ce3) into dev.cc

This time for sure!

Change-Id: I7e7ea24edb7c2f711489e162fb97237a87533089
---

b4a7806724b78f7c26326f6acee0dcca0110b7a8