fixed contrary meaning of i18 property
Merge branch 'master' of git://github.com/geoserver/geoserver
fix GEOS-5995-deadlock setting spring to 3.1.4
Merge pull request #309 from ccancellieri/master-GEOS-5995-deadlock

fix GEOS-5995-deadlock setting spring to 3.1.4
Merge branch 'master' of git://github.com/geoserver/geoserver
[GEOS-5985] Tomcat with APR can result in full JVM crashes
Test for GEOT-4550: WMS app-schema with reprojection returns blank image
Merge branch 'master' of git://github.com/geoserver/geoserver
Merge pull request #310 from aaime/geos-5985-v2

[GEOS-5985] Tomcat with APR can result in full JVM crashes
Merge branch 'master' of git://github.com/geoserver/geoserver
[GEOS-6007] WFS bbox filters with the 5th srs parameter will loose the srsName if the CRS cannot be turned back into a code (e.g., AUTO:xyzw projections)
Update GeoScript dependency in CSS extension
Merge branch 'master' of github-opengeo:opengeo/geoserver
Fix argLine for app-schema-test so it picks up maxHeapSize etc.
Merge branch 'master' of git://github.com/geoserver/geoserver
updated release artifact descriptor versions to 2.5-SNAPSHOT
Merge branch 'master' of git://github.com/geoserver/geoserver
updating version numbers to 2.5 for mac/win installer files, and extension readmes
Merge branch 'master' of git://github.com/geoserver/geoserver