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

[Vincent Batts]

commit 89650786aaa959b3136a5ebd9dccaa5f6212604d
Merge: 6e03bb4 789ff2e
Author: Vincent Batts <vbatts at redhat.com>
Date:   Wed May 14 09:05:26 2014 -0400

    Merge branch 'master' into epel7

 golang.spec |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)
---