From: Keith Randall <khr@golang.org>
Date: Tue, 25 Aug 2015 21:45:41 +0000 (-0700)
Subject: [dev.ssa] Merge remote-tracking branch 'origin/master' into mergebranch
X-Git-Tag: go1.7beta1~1623^2^2~244
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=ee50cb20611bd59b889ba0698e1236a992ea7579;p=gostls13.git

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

Semi-regular merge of master into dev.ssa.

Change-Id: Ia7f2e29dfdea7618141efcfcf6f6c7c8b5553dfa
---

ee50cb20611bd59b889ba0698e1236a992ea7579