From: Russ Cox <rsc@golang.org>
Date: Wed, 19 Aug 2015 04:37:55 +0000 (-0400)
Subject: [release-branch.go1.5] release: merge master branch into release-branch.go1.5.
X-Git-Tag: go1.5~1
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=a30edb80715ea5c7bbed6083859d3c54632d6b4b;p=gostls13.git

[release-branch.go1.5] release: merge master branch into release-branch.go1.5.

Using merge instead of cherry-picks to simplify initial release.
Minor releases like Go 1.5.1 will have to use cherry-picks.

Fixes #12093.

Change-Id: If00393c58ace0da6f359b387cea9b779b123b920
---

a30edb80715ea5c7bbed6083859d3c54632d6b4b