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

[Vincent Batts]

commit cf919785577d794f90e244d9fe5a8e660284f499
Merge: 4ea74e3 74686a2
Author: Vincent Batts <vbatts at redhat.com>
Date:   Mon May 19 16:40:39 2014 -0400

    Merge branch 'master' into f20

 golang.spec |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 57 insertions(+), 1 deletions(-)
---