Merge branch '1.1.x'

This commit is contained in:
Andy Wilkinson 2014-10-29 17:47:28 +00:00
commit c8d7a6dc24
3 changed files with 6 additions and 6 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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>