Commit c8d7a6dc authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '1.1.x'

parents 8a1e010d 9a491013
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<developer> <developer>
<id>pwebb</id> <id>pwebb</id>
<name>Phillip Webb</name> <name>Phillip Webb</name>
<email>pwebb at gopivotal.com</email> <email>pwebb at pivotal.io</email>
<organization>Pivotal Software, Inc.</organization> <organization>Pivotal Software, Inc.</organization>
<organizationUrl>http://www.spring.io</organizationUrl> <organizationUrl>http://www.spring.io</organizationUrl>
<roles> <roles>
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<developer> <developer>
<id>dsyer</id> <id>dsyer</id>
<name>Dave Syer</name> <name>Dave Syer</name>
<email>dsyer at gopivotal.com</email> <email>dsyer at pivotal.io</email>
<organization>Pivotal Software, Inc.</organization> <organization>Pivotal Software, Inc.</organization>
<organizationUrl>http://www.spring.io</organizationUrl> <organizationUrl>http://www.spring.io</organizationUrl>
<roles> <roles>
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<developer> <developer>
<id>pwebb</id> <id>pwebb</id>
<name>Phillip Webb</name> <name>Phillip Webb</name>
<email>pwebb at gopivotal.com</email> <email>pwebb at pivotal.io</email>
<organization>Pivotal Software, Inc.</organization> <organization>Pivotal Software, Inc.</organization>
<organizationUrl>http://www.spring.io</organizationUrl> <organizationUrl>http://www.spring.io</organizationUrl>
<roles> <roles>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<developer> <developer>
<id>dsyer</id> <id>dsyer</id>
<name>Dave Syer</name> <name>Dave Syer</name>
<email>dsyer at gopivotal.com</email> <email>dsyer at pivotal.io</email>
<organization>Pivotal Software, Inc.</organization> <organization>Pivotal Software, Inc.</organization>
<organizationUrl>http://www.spring.io</organizationUrl> <organizationUrl>http://www.spring.io</organizationUrl>
<roles> <roles>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<developer> <developer>
<id>pwebb</id> <id>pwebb</id>
<name>Phillip Webb</name> <name>Phillip Webb</name>
<email>pwebb at gopivotal.com</email> <email>pwebb at pivotal.io</email>
<organization>Pivotal Software, Inc.</organization> <organization>Pivotal Software, Inc.</organization>
<organizationUrl>http://www.spring.io</organizationUrl> <organizationUrl>http://www.spring.io</organizationUrl>
<roles> <roles>
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<developer> <developer>
<id>dsyer</id> <id>dsyer</id>
<name>Dave Syer</name> <name>Dave Syer</name>
<email>dsyer at gopivotal.com</email> <email>dsyer at pivotal.io</email>
<organization>Pivotal Software, Inc.</organization> <organization>Pivotal Software, Inc.</organization>
<organizationUrl>http://www.spring.io</organizationUrl> <organizationUrl>http://www.spring.io</organizationUrl>
<roles> <roles>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment