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

[Vincent Batts]

commit a518e20201bf80095474a33fb842adcb3901d588
Merge: 81323f3 74686a2
Author: Vincent Batts <vbatts at redhat.com>
Date:   Mon May 19 16:44:06 2014 -0400

    Merge branch 'master' into el6

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