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

[Vincent Batts]

commit 9a0700752046a683d397efaa0e6c4af93786c824
Merge: 0aff087 b5cbd1e
Author: Vincent Batts <vbatts at redhat.com>
Date:   Thu Jan 16 19:19:09 2014 -0500

    Merge branch 'master' into epel7

 golang-1.2-remove-ECC-p224.patch |  164 ++++++++++++++++++++++++++++++++++++++
 golang.spec                      |   16 +++-
 2 files changed, 177 insertions(+), 3 deletions(-)
---