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

[Vincent Batts]

commit d0e5db2e11772d15926334f99889fac14053a017
Merge: 8965078 6109664
Author: Vincent Batts <vbatts at redhat.com>
Date:   Tue May 20 13:16:02 2014 -0400

    Merge branch 'master' into epel7

 golang.spec |   68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 65 insertions(+), 3 deletions(-)
---