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

[Vincent Batts]

commit a9a1e214b27a142095fd1d76028d1fa916fdba47
Merge: 9a07007 25b1d04
Author: Vincent Batts <vbatts at redhat.com>
Date:   Fri Jan 24 14:02:47 2014 -0500

    Merge branch 'master' into epel7

 golang-1.2-skipCpuProfileTest.patch |   12 ++++++++++++
 golang.spec                         |   12 +++++++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---