tree d6aae69202512a89e023d6e24d687a89222ad832
parent e22ea758e46ef56a0c1e6a72ab9051218fd7da81
parent f22c0ac2a538c7deba19f5c69226d97356e634cb
author Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 1323048712 -0600
committer Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 1323048712 -0600

Merge branch 'libpng15' of ssh://www.simplesystems.org/git/libpng into libpng15

Conflicts:
	ANNOUNCE
	CHANGES