tree b9055c90db4f3a5c46c820b937cbeb49e9877cc5
parent 0f59bbb5b681b9d13772e120c57ad18b792577c0
parent 9ca5f1bdc800788e523c4b96c8abbef2e1d77f47
author Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 1328073729 -0600
committer Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 1328073729 -0600

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

Conflicts:
	ANNOUNCE