Merge branch 'libpng15' of ssh://libpng.git.sourceforge.net/gitroot/libpng/libpng into libpng15

Conflicts:
	ANNOUNCE
This commit is contained in:
Glenn Randers-Pehrson 2012-01-31 23:22:09 -06:00
commit 902dbe619e

Diff Content Not Available