]> Cypherpunks repositories - gostls13.git/commitdiff
[release-branch.go1.5] release: merge master branch into release-branch.go1.5.
authorRuss Cox <rsc@golang.org>
Wed, 19 Aug 2015 04:37:55 +0000 (00:37 -0400)
committerRuss Cox <rsc@golang.org>
Wed, 19 Aug 2015 04:39:48 +0000 (00:39 -0400)
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


Trivial merge