Merge branch '3.1.x'

2011-12-22 14:55:10 +01:00
parent e091e399dc c39a14a130
commit 05d10a5dac
74 changed files with 8670 additions and 8634 deletions
--- a/org.springframework.web/src/main/java/overview.html
+++ b/org.springframework.web/src/main/java/overview.html
@@ -1,7 +1,7 @@
-<html>
-<body>
-<p>
-Spring's core web support packages, for any kind of web environment.
-</p>
-</body>
+<html>
+<body>
+<p>
+Spring's core web support packages, for any kind of web environment.
+</p>
+</body>
 </html>
--- a/org.springframework.web/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
+++ b/org.springframework.web/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java