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

[Vincent Batts]

commit 3dab810ad86660f849a8f1f1eb73cb00bf037af3
Merge: 70cefcf c8bd3b7
Author: Vincent Batts <vbatts at redhat.com>
Date:   Fri May 9 08:23:47 2014 -0400

    Merge branch 'master' into el6

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