tree a1f20dcc4925752e72abf624c45cf50fdc552b25
parent 17749bdd61f70f2e9efe9ce50af572a6e5a1e4a8
parent daf54fe4fce741e91d224fd2303fab11019d739e
author Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 1448379299 -0600
committer Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 1448379299 -0600

Merge branch 'libpng15-20151123' of git://github.com/jbowler/libpng-1 into libpng15