Fixed bug #67024 - getimagesize should recognize BMP files with negative height
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height
fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height