[golang/el6: 26/26] Merge branch 'f20' into el6

[Vincent Batts]

commit 27d627a74b823af0e36a233aa2369a4fe921157b
Merge: 97dd9b4 6da1cd9
Author: Vincent Batts <vbatts at redhat.com>
Date:   Thu Aug 7 03:46:47 2014 +0000

    Merge branch 'f20' into el6
    
    Conflicts:
    	golang.spec

 golang.spec |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
---