Fixes #6620. R=golang-dev, dave, r CC=golang-dev https://golang.org/cl/15330043
Attach a file by drag & drop or click to upload
