[golang-googlecode-net/el6: 4/4] Merge branch 'master' into el6

[Vincent Batts]

commit 6bb8374cb9482f8433a7df7dd45a842e8629db73
Merge: 370b18e fe7eaf7
Author: Vincent Batts <vbatts(a)redhat.com&gt;
Date:   Fri Jul 11 13:52:16 2014 -0400

    Merge branch 'master' into el6
    
    Conflicts:
    	golang-googlecode-net.spec

 golang-googlecode-net.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc golang-googlecode-net.spec
index ef6af20,77d0bb5..569795c
--- a/golang-googlecode-net.spec
+++ b/golang-googlecode-net.spec
@@@ -105,6 -105,12 +105,9 @@@ GOPATH=%{buildroot}/%{gopath} go test %
  %{gopath}/src/%{import_path}/websocket/*.go
  
  %changelog
+ * Fri Jul 11 2014 Vincent Batts <vbatts(a)fedoraproject.org&gt; -
0-0.15.hg84a4013f96e0
+ - don't fail on ipv6 test bz1056185
+ 
 -* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; -
0-0.14.hg84a4013f96e0
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 -
  * Fri Jan 17 2014 Lokesh Mandvekar <lsm5(a)redhat.com&gt; 0-0.13.hg84a4013f96e0
  - golang exclusivearch for el6+
  - add check