From: Russ Cox <rsc@golang.org>
Date: Mon, 6 Oct 2014 18:45:36 +0000 (-0400)
Subject: [dev.garbage] all: merge default into dev.garbage
X-Git-Tag: go1.5beta1~2684^2~34
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=42e67170f492007aa0f05f9e2d002e523a0ca11d;p=gostls13.git

[dev.garbage] all: merge default into dev.garbage

This picks up the TestDualStackUDPListener fix.

LGTM=rlh
R=rlh
CC=golang-codereviews
https://golang.org/cl/147660044
---

42e67170f492007aa0f05f9e2d002e523a0ca11d