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

[Vincent Batts]

commit 5a0728e5a26102318a2a72f27093daf4528dd14e
Merge: 766dafa 5a84c90
Author: Vincent Batts <vbatts at redhat.com>
Date:   Wed Dec 4 10:11:20 2013 -0500

    Merge branch 'master' into el6

 .gitignore                                         |    1 +
 golang-1.1.2-long-links.patch                      |  510 --------------------
 golang-1.1.2-ustar-split.patch                     |   62 ---
 ...e-build.patch => golang-1.2-verbose-build.patch |   14 +-
 golang.spec                                        |   57 +--
 sources                                            |    2 +-
 6 files changed, 27 insertions(+), 619 deletions(-)
---