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

[Vincent Batts]

commit ea5e86ce3d634fe241d1d3147bcecbc245b1f61c
Merge: 2f21c1b b5cbd1e
Author: Vincent Batts <vbatts at redhat.com>
Date:   Mon Jan 20 17:31:13 2014 -0500

    Merge branch 'master' into f20

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