tree 656b19140efdf0caba7bcefd38b1fc7f3f8b61c6
parent 5d343bdfb140970cc37f099064226d104ca6d817
parent 939a9424de5c3d0a0d2e1769778b5b0aa9c61954
author Russ Cox <rsc@golang.org> 1455734703 -0500
committer Russ Cox <rsc@golang.org> 1455734703 -0500

all: merge master into release-branch.go1.6

Change-Id: Ie2a999e36ee654c1217bd03f720791360f66718d