tree 52b2802b0c5ab3e06d058744a586078d8e33946f
parent 036b8fd40b60830ca1d152f17148e52b96d8aa6c
parent f309bf3eeff8343e557a9798e42ac72b37da3f0a
author Russ Cox <rsc@golang.org> 1454423020 -0500
committer Russ Cox <rsc@golang.org> 1454426246 -0500

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

Change-Id: I10a3abc28028e35c5d92d1bd33ac64fe0825eae7