Commit c8d7a6dc authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '1.1.x'

parents 8a1e010d 9a491013
......@@ -25,7 +25,7 @@
<developer>
<id>pwebb</id>
<name>Phillip Webb</name>
<email>pwebb at gopivotal.com</email>
<email>pwebb at pivotal.io</email>
<organization>Pivotal Software, Inc.</organization>
<organizationUrl>http://www.spring.io</organizationUrl>
<roles>
......@@ -35,7 +35,7 @@
<developer>
<id>dsyer</id>
<name>Dave Syer</name>
<email>dsyer at gopivotal.com</email>
<email>dsyer at pivotal.io</email>
<organization>Pivotal Software, Inc.</organization>
<organizationUrl>http://www.spring.io</organizationUrl>
<roles>
......
......@@ -26,7 +26,7 @@
<developer>
<id>pwebb</id>
<name>Phillip Webb</name>
<email>pwebb at gopivotal.com</email>
<email>pwebb at pivotal.io</email>
<organization>Pivotal Software, Inc.</organization>
<organizationUrl>http://www.spring.io</organizationUrl>
<roles>
......@@ -36,7 +36,7 @@
<developer>
<id>dsyer</id>
<name>Dave Syer</name>
<email>dsyer at gopivotal.com</email>
<email>dsyer at pivotal.io</email>
<organization>Pivotal Software, Inc.</organization>
<organizationUrl>http://www.spring.io</organizationUrl>
<roles>
......
......@@ -25,7 +25,7 @@
<developer>
<id>pwebb</id>
<name>Phillip Webb</name>
<email>pwebb at gopivotal.com</email>
<email>pwebb at pivotal.io</email>
<organization>Pivotal Software, Inc.</organization>
<organizationUrl>http://www.spring.io</organizationUrl>
<roles>
......@@ -35,7 +35,7 @@
<developer>
<id>dsyer</id>
<name>Dave Syer</name>
<email>dsyer at gopivotal.com</email>
<email>dsyer at pivotal.io</email>
<organization>Pivotal Software, Inc.</organization>
<organizationUrl>http://www.spring.io</organizationUrl>
<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