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

[Vincent Batts]

commit 12d61d4672d3a39fdd2a234cac247c93094ae961
Merge: 8531054 4620c48
Author: Vincent Batts <vbatts at redhat.com>
Date:   Wed May 21 12:51:03 2014 -0400

    Merge branch 'master' into epel7

 golang.spec |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)
---