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

[Vincent Batts]

commit 412a4623e425568e54c359b765660948e4d54c43
Merge: fa35b27 4620c48
Author: Vincent Batts <vbatts at redhat.com>
Date:   Wed May 21 12:50:38 2014 -0400

    Merge branch 'master' into f19

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