[golang/el6: 11/11] Merge branch 'master' into el6

[Vincent Batts]

commit 70cefcfce27488950f180161a6aed5de341b571b
Merge: 8b15f65 2911c49
Author: Vincent Batts <vbatts at redhat.com>
Date:   Fri May 9 07:22:08 2014 -0400

    Merge branch 'master' into el6

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