Merge branch '5.5' into 10.1

14 files changed, 14 insertions, 14 deletions

diff --git a/vio/CMakeLists.txt b/vio/CMakeLists.txt
index cdb28799ada..6749d3c699b 100644
--- a/vio/CMakeLists.txt
+++ b/vio/CMakeLists.txt
@@ -11,7 +11,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1335 USA
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 
 ${SSL_INCLUDE_DIRS})
diff --git a/vio/test-ssl.c b/vio/test-ssl.c
index c99f5071055..dc116e7e43c 100644
--- a/vio/test-ssl.c
+++ b/vio/test-ssl.c
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 #include <my_global.h>
 #if defined(HAVE_OPENSSL)
diff --git a/vio/test-sslclient.c b/vio/test-sslclient.c
index 93fdb063754..487c7b92bfb 100644
--- a/vio/test-sslclient.c
+++ b/vio/test-sslclient.c
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 #include <my_global.h>
 #ifdef HAVE_OPENSSL
diff --git a/vio/test-sslserver.c b/vio/test-sslserver.c
index c81dc03dc58..8d63fd16f33 100644
--- a/vio/test-sslserver.c
+++ b/vio/test-sslserver.c
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 #include <my_global.h>
 #ifdef HAVE_OPENSSL
diff --git a/vio/vio.c b/vio/vio.c
index e3bc8ca8ab8..ee84d27a3d8 100644
--- a/vio/vio.c
+++ b/vio/vio.c
@@ -12,7 +12,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /*
   Note that we can't have assertion on file descriptors;  The reason for
diff --git a/vio/vio_priv.h b/vio/vio_priv.h
index 248e1a59b23..71a0468e226 100644
--- a/vio/vio_priv.h
+++ b/vio/vio_priv.h
@@ -12,7 +12,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 #ifndef VIO_PRIV_INCLUDED
 #define VIO_PRIV_INCLUDED
diff --git a/vio/viopipe.c b/vio/viopipe.c
index f9af50bc3c9..2d784ecde61 100644
--- a/vio/viopipe.c
+++ b/vio/viopipe.c
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 #include "vio_priv.h"
 
diff --git a/vio/vioshm.c b/vio/vioshm.c
index acc7d2402c5..7b491b8f9b4 100644
--- a/vio/vioshm.c
+++ b/vio/vioshm.c
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 #include "vio_priv.h"
 
diff --git a/vio/viosocket.c b/vio/viosocket.c
index e11460dd4b2..e22e8e85ff6 100644
--- a/vio/viosocket.c
+++ b/vio/viosocket.c
@@ -15,7 +15,7 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-   02110-1301  USA */
+   02110-1335  USA */
 
 /*
   Note that we can't have assertion on file descriptors;  The reason for
diff --git a/vio/viossl.c b/vio/viossl.c
index 0bc2c263336..8a81c22c035 100644
--- a/vio/viossl.c
+++ b/vio/viossl.c
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /*
   Note that we can't have assertion on file descriptors;  The reason for
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c
index 52b624d3376..8895cce3d18 100644
--- a/vio/viosslfactories.c
+++ b/vio/viosslfactories.c
@@ -12,7 +12,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 #include "vio_priv.h"
 
diff --git a/vio/viotest-ssl.c b/vio/viotest-ssl.c
index 51d171d6923..36d67b9f85f 100644
--- a/vio/viotest-ssl.c
+++ b/vio/viotest-ssl.c
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 #include <my_global.h>
 #ifdef HAVE_OPENSSL
diff --git a/vio/viotest-sslconnect.cc b/vio/viotest-sslconnect.cc
index 18e558159fa..dee3e318aef 100644
--- a/vio/viotest-sslconnect.cc
+++ b/vio/viotest-sslconnect.cc
@@ -12,7 +12,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /* 
 **  Virtual I/O library
diff --git a/vio/viotest.cc b/vio/viotest.cc
index b1c11a85cf2..cfb74cf3a61 100644
--- a/vio/viotest.cc
+++ b/vio/viotest.cc
@@ -12,7 +12,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /* 
 **  Virtual I/O library