]> Cypherpunks repositories - gostls13.git/commitdiff
all: merge master into release-branch.go1.6
authorRuss Cox <rsc@golang.org>
Tue, 2 Feb 2016 16:45:03 +0000 (11:45 -0500)
committerRuss Cox <rsc@golang.org>
Tue, 2 Feb 2016 16:45:28 +0000 (11:45 -0500)
Change-Id: I2f98729ca7209f284dabf33d0dea974873f16ada


Trivial merge