Chris Beams 0ae973f995 Merge branch '3.1.x' ...

Conflicts:
	spring-webmvc/src/main/java/org/springframework/web/servlet/support/DefaultFlashMapManager.java
	spring-webmvc/src/test/java/org/springframework/web/servlet/support/DefaultFlashMapManagerTests.java

2012-02-01 11:39:48 +01:00

..

api

Generate -sources and -javadoc jars

2012-01-31 14:32:16 +01:00

dist

Merge branch '3.1.x'

2012-02-01 11:39:48 +01:00

reference/docbook

Merge branch '3.1.x'

2012-01-31 16:03:24 +01:00

test

Move integration tests => src/test

2012-01-31 14:32:14 +01:00