From: Russ Cox <rsc@golang.org>
Date: Fri, 5 Dec 2014 16:45:03 +0000 (-0500)
Subject: all: merge default (faa3ed1dc30e) into dev.garbage
X-Git-Tag: go1.5beta1~2684^2~2
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b537635a7fa89d7dcf04cb7327d3622d248f78b8;p=gostls13.git

all: merge default (faa3ed1dc30e) into dev.garbage
---

b537635a7fa89d7dcf04cb7327d3622d248f78b8