tree 4c71d5eb54498548ab9b0f51bff6d28163a3d24c
parent 9a80b5e1f3b4728e161c0972d8e692c3bc915bb5
parent b6c5edae7c0e9dd6d12dbb8f1c9638dea45f9464
author Russ Cox <rsc@golang.org> 1454431503 -0500
committer Russ Cox <rsc@golang.org> 1454431528 -0500

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

Change-Id: I2f98729ca7209f284dabf33d0dea974873f16ada