[golang/epel7: 10/10] Merge branch 'master' into epel7

[Vincent Batts]

commit 9cc2b544fe63f2597aeae22076092926650c45ab
Merge: 8537b89 5f099a5
Author: Vincent Batts <vbatts(a)redhat.com&gt;
Date:   Thu May 8 11:41:21 2014 -0400

    Merge branch 'master' into epel7

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