]> Cypherpunks repositories - gostls13.git/commit
[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)
commita30edb80715ea5c7bbed6083859d3c54632d6b4b
tree4cc4d7f474ab8fa4bcde8417ae93e1aef81b9ea5
parent0d20a61e68ba22fb416fe2aa8b6532026822bad0
parentfa87cf83a64edf30b9da867a96ee83d9f24af867
[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