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

[Vincent Batts]

commit 2f21c1b8e2dc617275dabc0eff7b093cba0fc4c3
Merge: 3d2e2d5 5a84c90
Author: Vincent Batts <vbatts at redhat.com>
Date:   Wed Dec 4 10:33:43 2013 -0500

    Merge branch 'master' into f20

 .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(-)
---