]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorMichael Wallner <mike@php.net>
Mon, 21 Oct 2013 20:15:55 +0000 (22:15 +0200)
committerMichael Wallner <mike@php.net>
Mon, 21 Oct 2013 20:15:55 +0000 (22:15 +0200)
commit757f4a952ce77b7892b38e177fa78de8e2f54128
treef4d8d1fb491031de9a27636da103c3a8f9acd57a
parentb636c03426193ecf0b7e166126a14b70ce8185e9
parent2fa5f39e4c489495b886214aa788d0fbffe06446
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add tests for bug #62523
  Merged PR #293 (Exif crash on unknown encoding was fixed) By:  Draal Conflicts:  configure.in  main/php_version.h