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

[Vincent Batts]

commit 178b1469c1b0e38d8d49772e4d94321515b168be
Merge: a0dbb55 c8bd3b7
Author: Vincent Batts <vbatts at redhat.com>
Date:   Fri May 9 08:22:51 2014 -0400

    Merge branch 'master' into f20

 .gitignore  |    1 +
 golang.spec |   72 +++++++++++++++++++++++++++++++++++++---------------------
 sources     |    2 +-
 3 files changed, 48 insertions(+), 27 deletions(-)
---