Backporting the pngj module to the 2.3.x series
Merge branch '2.3.x' of git://github.com/geoserver/geoserver into 2.3.x