]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b636c03 2fa5f39)
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)
* 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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.