geoserver/geoserver — pull request #546 by markusin (2014-03-24 15:35:03+00:00)
Title: 2.4.x

Fixing issues
http://jira.codehaus.org/browse/GEOS-6410
and
http://jira.codehaus.org/browse/GEOS-6411