Merged bug25538 into stablerabbitmq_v3_1_4

8 files changed, 10 insertions, 10 deletions

diff --git a/LICENSE-MPL-RabbitMQ b/LICENSE-MPL-RabbitMQ
index 4cdf783b..549d0f1c 100644
--- a/LICENSE-MPL-RabbitMQ
+++ b/LICENSE-MPL-RabbitMQ
@@ -446,8 +446,8 @@ EXHIBIT A -Mozilla Public License.
 
      The Original Code is RabbitMQ.
 
-     The Initial Developer of the Original Code is VMware, Inc.
-     Copyright (c) 2007-2013 VMware, Inc.  All rights reserved.''
+     The Initial Developer of the Original Code is GoPivotal, Inc.
+     Copyright (c) 2007-2013 GoPivotal, Inc.  All rights reserved.''
 
      [NOTE: The text of this Exhibit A may differ slightly from the text of
      the notices in the Source Code files of the Original Code. You should
diff --git a/README.extensions.md b/README.extensions.md
index 3200491d..74b24fc6 100644
--- a/README.extensions.md
+++ b/README.extensions.md
@@ -186,4 +186,4 @@ The reasons for allowing more than one action, are that
 
 The main reason things are laid out this way, however, is simply that
 it's an accident of the history of the code. We may change the API to
-`amqp_codegen` in future to clean things up a little.
\ No newline at end of file
+`amqp_codegen` in future to clean things up a little.
diff --git a/amqp-rabbitmq-0.8.json b/amqp-rabbitmq-0.8.json
index e93dc1a0..35f88566 100644
--- a/amqp-rabbitmq-0.8.json
+++ b/amqp-rabbitmq-0.8.json
@@ -4,7 +4,7 @@
     "minor-version": 0,
     "port": 5672,
     "copyright": [
-        "Copyright (C) 2008-2013 VMware, Inc.\n",
+        "Copyright (C) 2008-2013 GoPivotal, Inc.\n",
         "\n",
         "Permission is hereby granted, free of charge, to any person\n",
         "obtaining a copy of this file (the \"Software\"), to deal in the\n",
diff --git a/amqp-rabbitmq-0.9.1.json b/amqp-rabbitmq-0.9.1.json
index 141e37bd..32c3aca0 100644
--- a/amqp-rabbitmq-0.9.1.json
+++ b/amqp-rabbitmq-0.9.1.json
@@ -5,7 +5,7 @@
     "revision": 1,
     "port": 5672,
     "copyright": [
-        "Copyright (C) 2008-2013 VMware, Inc.\n",
+        "Copyright (C) 2008-2013 GoPivotal, Inc.\n",
         "\n",
         "Permission is hereby granted, free of charge, to any person\n",
         "obtaining a copy of this file (the \"Software\"), to deal in the\n",
diff --git a/amqp_codegen.py b/amqp_codegen.py
index 61e2596a..96308fc6 100644
--- a/amqp_codegen.py
+++ b/amqp_codegen.py
@@ -10,8 +10,8 @@
 ##
 ##  The Original Code is RabbitMQ.
 ##
-##  The Initial Developer of the Original Code is VMware, Inc.
-##  Copyright (c) 2007-2013 VMware, Inc.  All rights reserved.
+##  The Initial Developer of the Original Code is GoPivotal, Inc.
+##  Copyright (c) 2007-2013 GoPivotal, Inc.  All rights reserved.
 ##
 
 from __future__ import nested_scopes
diff --git a/credit_extension.json b/credit_extension.json
index b983345f..b74391fe 100644
--- a/credit_extension.json
+++ b/credit_extension.json
@@ -9,7 +9,7 @@
             "hence you are strongly discouraged from building clients ",
             "which use it."],
         "copyright": [
-            "Copyright (C) 2008-2013 VMware, Inc.\n",
+            "Copyright (C) 2008-2013 GoPivotal, Inc.\n",
             "\n",
             "Permission is hereby granted, free of charge, to any person\n",
             "obtaining a copy of this file (the \"Software\"), to deal in the\n",
diff --git a/demo_extension.json b/demo_extension.json
index 26eb322f..7a636f15 100644
--- a/demo_extension.json
+++ b/demo_extension.json
@@ -2,7 +2,7 @@
     "extension": {
 	"name": "demo",
 	"version": "1.0",
-	"copyright": "Copyright (C) 2009-2013 VMware, Inc."
+	"copyright": "Copyright (C) 2009-2013 GoPivotal, Inc."
     },
     "domains": [
 	["foo-domain", "shortstr"]
diff --git a/license_info b/license_info
index d7dffccd..1cebe909 100644
--- a/license_info
+++ b/license_info
@@ -1,4 +1,4 @@
 The files amqp-rabbitmq-0.8.json and amqp-rabbitmq-0.9.1.json are
-"Copyright (C) 2008-2013 VMware", Inc. and are covered by the MIT
+"Copyright (C) 2008-2013 GoPivotal", Inc. and are covered by the MIT
 license.