From: Keith Randall <khr@golang.org>
Date: Wed, 1 Jul 2015 03:51:17 +0000 (-0700)
Subject: [dev.ssa] Merge remote-tracking branch 'origin/master' into ssamerge
X-Git-Tag: go1.7beta1~1623^2^2~417
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=90b0a932441163a7c20005a8640cd3ed1155a4ca;p=gostls13.git

[dev.ssa] Merge remote-tracking branch 'origin/master' into ssamerge

Semi-regular merge from tip into ssa branch.

Change-Id: I9cbe23f566410496d4ceb97c1435e2df7f2b56ec
---

90b0a932441163a7c20005a8640cd3ed1155a4ca