tree 4cc4d7f474ab8fa4bcde8417ae93e1aef81b9ea5
parent 0d20a61e68ba22fb416fe2aa8b6532026822bad0
parent fa87cf83a64edf30b9da867a96ee83d9f24af867
author Russ Cox <rsc@golang.org> 1439959075 -0400
committer Russ Cox <rsc@golang.org> 1439959188 -0400

[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