Bump the Geoserver version to 2.4
Merge branch 'geoserver2.4'