[golang/f20: 9/9] Merge branch 'master' into f20

[Vincent Batts]

commit a0dbb554839346d8208b5e9ca2905fdc8fd2b5ff
Merge: 9b901fa 5f099a5
Author: Vincent Batts <vbatts at redhat.com>
Date:   Thu May 8 12:39:30 2014 -0400

    Merge branch 'master' into f20

 golang-1.2.1-disable_testsetgid.patch    |    9 +
 golang-1.2.1-i686-cgo-test-failure.patch |   13 +
 golang.spec                              |  631 ++++++++++++++++++++++++++++--
 macros.golang                            |    7 +
 4 files changed, 631 insertions(+), 29 deletions(-)
---