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

[Vincent Batts]

commit 4ea74e374aadb8057ee2e30511708be43f327173
Merge: 178b146 789ff2e
Author: Vincent Batts <vbatts(a)redhat.com&gt;
Date:   Wed May 14 09:03:31 2014 -0400

    Merge branch 'master' into f20

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