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

[Vincent Batts]

commit 3d2e2d5e92e216f8529624b4dc4c5a57d413570a
Merge: 6dfa9a8 4e1713b
Author: Vincent Batts <vbatts at redhat.com>
Date:   Tue Nov 26 16:06:10 2013 -0500

    Merge branch 'master' into f20

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