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

[Vincent Batts]

commit 4604bf724d3fb2492c33d28e6426c5a37409ab5d
Merge: ea5e86c 25b1d04
Author: Vincent Batts <vbatts at redhat.com>
Date:   Fri Jan 24 14:04:31 2014 -0500

    Merge branch 'master' into f20

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