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

[Vincent Batts]

commit 64f997fc9725dfda1b3b04949d297fbc86ce9ce4
Merge: 5a0728e b5cbd1e
Author: Vincent Batts <vbatts at redhat.com>
Date:   Mon Jan 20 17:31:05 2014 -0500

    Merge branch 'master' into el6

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