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

[Vincent Batts]

commit 81323f3ca5ff780540d8c3bc033df7994c80e777
Merge: 3dab810 789ff2e
Author: Vincent Batts <vbatts at redhat.com>
Date:   Wed May 14 09:02:30 2014 -0400

    Merge branch 'master' into el6

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